You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
142 lines
5.0 KiB
142 lines
5.0 KiB
2009-10-29 Stepan Kasal <skasal@redhat.com> |
|
|
|
Make build with autoconf 2.59. |
|
|
|
diff -urN powerpc-utils-1.2.2.orig/configure.ac powerpc-utils-1.2.2/configure.ac |
|
--- powerpc-utils-1.2.2.orig/configure.ac 2009-10-22 21:00:13.000000000 +0200 |
|
+++ powerpc-utils-1.2.2/configure.ac 2009-10-29 15:41:58.000000000 +0100 |
|
@@ -1,8 +1,9 @@ |
|
# -*- Autoconf -*- |
|
# Process this file with autoconf to produce a configure script. |
|
|
|
-AC_PREREQ([2.63]) |
|
-AC_INIT([powerpc-utils], [1.2.0], [nfont@austin.ibm.com]) |
|
+AC_PREREQ([2.59]) |
|
+m4_include([ac_type_uint.m4]) |
|
+AC_INIT([powerpc-utils], [1.2.2], [nfont@austin.ibm.com]) |
|
AM_INIT_AUTOMAKE |
|
AC_CONFIG_SRCDIR([src/rtas_ibm_get_vpd.c]) |
|
|
|
diff -urN powerpc-utils-1.2.2.orig/ac_type_uint.m4 powerpc-utils-1.2.2/ac_type_uint.m4 |
|
--- powerpc-utils-1.2.2.orig/ac_type_uint.m4 1970-01-01 01:00:00.000000000 +0100 |
|
+++ powerpc-utils-1.2.2/ac_type_uint.m4 2009-10-29 16:04:41.000000000 +0100 |
|
@@ -0,0 +1,119 @@ |
|
+AC_DEFUN([AC_TYPE_INT8_T], [_AC_TYPE_INT(8)]) |
|
+AC_DEFUN([AC_TYPE_INT16_T], [_AC_TYPE_INT(16)]) |
|
+AC_DEFUN([AC_TYPE_INT32_T], [_AC_TYPE_INT(32)]) |
|
+AC_DEFUN([AC_TYPE_INT64_T], [_AC_TYPE_INT(64)]) |
|
+AC_DEFUN([AC_TYPE_UINT8_T], [_AC_TYPE_UNSIGNED_INT(8)]) |
|
+AC_DEFUN([AC_TYPE_UINT16_T], [_AC_TYPE_UNSIGNED_INT(16)]) |
|
+AC_DEFUN([AC_TYPE_UINT32_T], [_AC_TYPE_UNSIGNED_INT(32)]) |
|
+AC_DEFUN([AC_TYPE_UINT64_T], [_AC_TYPE_UNSIGNED_INT(64)]) |
|
+ |
|
+# _AC_TYPE_INT(NBITS) |
|
+# ------------------- |
|
+AC_DEFUN([_AC_TYPE_INT], |
|
+[ |
|
+ AC_CACHE_CHECK([for int$1_t], [ac_cv_c_int$1_t], |
|
+ [ac_cv_c_int$1_t=no |
|
+ for ac_type in 'int$1_t' 'int' 'long int' \ |
|
+ 'long long int' 'short int' 'signed char'; do |
|
+ AC_COMPILE_IFELSE( |
|
+ [AC_LANG_BOOL_COMPILE_TRY( |
|
+ [AC_INCLUDES_DEFAULT], |
|
+ [[0 < ($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 1)]])], |
|
+ [AC_COMPILE_IFELSE( |
|
+ [AC_LANG_BOOL_COMPILE_TRY( |
|
+ [AC_INCLUDES_DEFAULT], |
|
+ [[($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 1) |
|
+ < ($ac_type) (((($ac_type) 1 << ($1 - 2)) - 1) * 2 + 2)]])], |
|
+ [], |
|
+ [AS_CASE([$ac_type], [int$1_t], |
|
+ [ac_cv_c_int$1_t=yes], |
|
+ [ac_cv_c_int$1_t=$ac_type])])]) |
|
+ test "$ac_cv_c_int$1_t" != no && break |
|
+ done]) |
|
+ case $ac_cv_c_int$1_t in #( |
|
+ no|yes) ;; #( |
|
+ *) |
|
+ AC_DEFINE_UNQUOTED([int$1_t], [$ac_cv_c_int$1_t], |
|
+ [Define to the type of a signed integer type of width exactly $1 bits |
|
+ if such a type exists and the standard includes do not define it.]);; |
|
+ esac |
|
+])# _AC_TYPE_INT |
|
+ |
|
+# _AC_TYPE_UNSIGNED_INT(NBITS) |
|
+# ---------------------------- |
|
+AC_DEFUN([_AC_TYPE_UNSIGNED_INT], |
|
+[ |
|
+ AC_CACHE_CHECK([for uint$1_t], [ac_cv_c_uint$1_t], |
|
+ [ac_cv_c_uint$1_t=no |
|
+ for ac_type in 'uint$1_t' 'unsigned int' 'unsigned long int' \ |
|
+ 'unsigned long long int' 'unsigned short int' 'unsigned char'; do |
|
+ AC_COMPILE_IFELSE( |
|
+ [AC_LANG_BOOL_COMPILE_TRY( |
|
+ [AC_INCLUDES_DEFAULT], |
|
+ [[($ac_type) -1 >> ($1 - 1) == 1]])], |
|
+ [AS_CASE([$ac_type], [uint$1_t], |
|
+ [ac_cv_c_uint$1_t=yes], |
|
+ [ac_cv_c_uint$1_t=$ac_type])]) |
|
+ test "$ac_cv_c_uint$1_t" != no && break |
|
+ done]) |
|
+ case $ac_cv_c_uint$1_t in #( |
|
+ no|yes) ;; #( |
|
+ *) |
|
+ m4_bmatch([$1], [^\(8\|32\|64\)$], |
|
+ [AC_DEFINE([_UINT$1_T], 1, |
|
+ [Define for Solaris 2.5.1 so the uint$1_t typedef from |
|
+ <sys/synch.h>, <pthread.h>, or <semaphore.h> is not used. |
|
+ If the typedef were allowed, the #define below would cause a |
|
+ syntax error.])]) |
|
+ AC_DEFINE_UNQUOTED([uint$1_t], [$ac_cv_c_uint$1_t], |
|
+ [Define to the type of an unsigned integer type of width exactly $1 bits |
|
+ if such a type exists and the standard includes do not define it.]);; |
|
+ esac |
|
+])# _AC_TYPE_UNSIGNED_INT |
|
+ |
|
+ |
|
+# AS_CASE(WORD, [PATTERN1], [IF-MATCHED1]...[DEFAULT]) |
|
+# ---------------------------------------------------- |
|
+# Expand into |
|
+# | case WORD in |
|
+# | PATTERN1) IF-MATCHED1 ;; |
|
+# | ... |
|
+# | *) DEFAULT ;; |
|
+# | esac |
|
+m4_define([_AS_CASE], |
|
+[ $1[)] m4_default([$2], [:]) ;; |
|
+]) |
|
+m4_define([_AS_CASE_DEFAULT], |
|
+[ *[)] $1 ;; |
|
+]) |
|
+m4_defun([AS_CASE], |
|
+[m4_ifval([$2$3], |
|
+[case $1 in |
|
+m4_transform_pair([_$0], [_$0_DEFAULT], m4_shift($@))dnl |
|
+esac |
|
+])dnl |
|
+])# AS_CASE |
|
+ |
|
+ |
|
+# m4_transform_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...) |
|
+# -------------------------------------------------------------- |
|
+# Perform a pairwise grouping of consecutive ARGs, by expanding |
|
+# EXPRESSION([ARG1], [ARG2]). If there are an odd number of ARGs, the |
|
+# final argument is expanded with END-EXPR([ARGn]). |
|
+# |
|
+# For example: |
|
+# m4_define([show], [($*)m4_newline])dnl |
|
+# m4_transform_pair([show], [], [a], [b], [c], [d], [e])dnl |
|
+# => (a,b) |
|
+# => (c,d) |
|
+# => (e) |
|
+# |
|
+# Please keep foreach.m4 in sync with any adjustments made here. |
|
+m4_define([m4_transform_pair], |
|
+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], |
|
+ [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])], |
|
+ [$#], [2], [], |
|
+ [$#], [3], [m4_default([$2], [$1])([$3])[]], |
|
+ [$#], [4], [$1([$3], [$4])[]], |
|
+ [$1([$3], [$4])[]$0([$1], [$2], m4_shift(m4_shift3($@)))])]) |
|
+
|
|
|