2008-07-16 01:40:14 +00:00 · 2008-07-16 01:40:14 +00:00 · 76b80109d9
commit 76b80109d9
parent 71e11073b2
3 changed files with 35 additions and 127 deletions
--- a/ase/configure
+++ b/ase/configure
@ -26411,165 +26411,92 @@ _ACEOF



-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_CHAR
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_SHORT
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_INT
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_LONG
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_LONG_LONG
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF___INT8
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF___INT16
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF___INT32
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF___INT64
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF___INT128
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_VOID_P
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_FLOAT
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_DOUBLE
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_LONG_DOUBLE
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_SIZEOF_WCHAR_T
-_ACEOF
-
-
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_CHAR ${ac_cv_sizeof_char}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_SHORT ${ac_cv_sizeof_short}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_INT ${ac_cv_sizeof_int}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_LONG ${ac_cv_sizeof_long}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_LONG_LONG ${ac_cv_sizeof_long_long}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF___INT8 ${ac_cv_sizeof___int8}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF___INT16 ${ac_cv_sizeof___int16}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF___INT32 ${ac_cv_sizeof___int32}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF___INT64 ${ac_cv_sizeof___int64}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF___INT128 ${ac_cv_sizeof___int128}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_VOID_P ${ac_cv_sizeof_void_p}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_FLOAT ${ac_cv_sizeof_float}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_DOUBLE ${ac_cv_sizeof_double}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_LONG_DOUBLE ${ac_cv_sizeof_long_double}
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_SIZEOF_WCHAR_T ${ac_cv_sizeof_wchar_t}
 _ACEOF



-cat >>confdefs.h <<\_ACEOF
-#define ASE_PKGNAME
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_PKGVERSION
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define ASE_PKGAUTHOR
-_ACEOF
-
 cat >>confdefs.h <<_ACEOF
 #define ASE_PKGNAME "${PACKAGE}"
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_PKGVERSION "${VERSION}"
 _ACEOF

+
 cat >>confdefs.h <<_ACEOF
 #define ASE_PKGAUTHOR "${PACKAGE_BUGREPORT}"
 _ACEOF
--- a/ase/configure.ac
+++ b/ase/configure.ac
@ -106,44 +106,25 @@ AC_CHECK_SIZEOF(double)
 AC_CHECK_SIZEOF(long double)
 AC_CHECK_SIZEOF(wchar_t)

-AC_DEFINE([ASE_SIZEOF_CHAR], [], [sizeof(char)])
-AC_DEFINE([ASE_SIZEOF_SHORT], [], [sizeof(short)])
-AC_DEFINE([ASE_SIZEOF_INT], [], [sizeof(int)])
-AC_DEFINE([ASE_SIZEOF_LONG], [], [sizeof(long)])
-AC_DEFINE([ASE_SIZEOF_LONG_LONG], [], [sizeof(long long)])
-AC_DEFINE([ASE_SIZEOF___INT8], [], [sizeof(__int8)])
-AC_DEFINE([ASE_SIZEOF___INT16], [], [sizeof(__int16)])
-AC_DEFINE([ASE_SIZEOF___INT32], [], [sizeof(__int32)])
-AC_DEFINE([ASE_SIZEOF___INT64], [], [sizeof(__int64)])
-AC_DEFINE([ASE_SIZEOF___INT128], [], [sizeof(__int128)])
-AC_DEFINE([ASE_SIZEOF_VOID_P], [], [sizeof(void*)])
-AC_DEFINE([ASE_SIZEOF_FLOAT], [], [sizeof(float)])
-AC_DEFINE([ASE_SIZEOF_DOUBLE], [], [sizeof(double)])
-AC_DEFINE([ASE_SIZEOF_LONG_DOUBLE], [], [sizeof(long double)])
-AC_DEFINE([ASE_SIZEOF_WCHAR_T], [], [sizeof(wchar_t)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_CHAR, ${ac_cv_sizeof_char}, [sizeof(char)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_SHORT, ${ac_cv_sizeof_short}, [sizeof(short)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_INT, ${ac_cv_sizeof_int}, [sizeof(int)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_LONG, ${ac_cv_sizeof_long}, [sizeof(long)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_LONG_LONG, ${ac_cv_sizeof_long_long}, [sizeof(long long)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT8, ${ac_cv_sizeof___int8}, [sizeof(__int8)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT16, ${ac_cv_sizeof___int16}, [sizeof(__int16)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT32, ${ac_cv_sizeof___int32}, [sizeof(__int32)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT64, ${ac_cv_sizeof___int64}, [sizeof(__int64)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT128, ${ac_cv_sizeof___int128}, [sizeof(__int128)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_VOID_P, ${ac_cv_sizeof_void_p}, [sizeof(void*)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_FLOAT, ${ac_cv_sizeof_float}, [sizeof(float)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_DOUBLE, ${ac_cv_sizeof_double}, [sizeof(double)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_LONG_DOUBLE, ${ac_cv_sizeof_long_double}, [sizeof(long double)])
+AC_DEFINE_UNQUOTED(ASE_SIZEOF_WCHAR_T, ${ac_cv_sizeof_wchar_t}, [sizeof(wchar_t)])

-AC_DEFINE_UNQUOTED(ASE_SIZEOF_CHAR,${ac_cv_sizeof_char})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_SHORT,${ac_cv_sizeof_short})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_INT,${ac_cv_sizeof_int})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_LONG,${ac_cv_sizeof_long})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_LONG_LONG,${ac_cv_sizeof_long_long})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT8,${ac_cv_sizeof___int8})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT16,${ac_cv_sizeof___int16})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT32,${ac_cv_sizeof___int32})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT64,${ac_cv_sizeof___int64})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF___INT128,${ac_cv_sizeof___int128})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_VOID_P,${ac_cv_sizeof_void_p})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_FLOAT,${ac_cv_sizeof_float})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_DOUBLE,${ac_cv_sizeof_double})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_LONG_DOUBLE,${ac_cv_sizeof_long_double})
-AC_DEFINE_UNQUOTED(ASE_SIZEOF_WCHAR_T,${ac_cv_sizeof_wchar_t})
-
-AC_DEFINE([ASE_PKGNAME], [], [package name])
-AC_DEFINE([ASE_PKGVERSION], [], [package version])
-AC_DEFINE([ASE_PKGAUTHOR], [], [author's email address])
-AC_DEFINE_UNQUOTED(ASE_PKGNAME,"${PACKAGE}")
-AC_DEFINE_UNQUOTED(ASE_PKGVERSION,"${VERSION}")
-AC_DEFINE_UNQUOTED(ASE_PKGAUTHOR,"${PACKAGE_BUGREPORT}")
+AC_DEFINE_UNQUOTED(ASE_PKGNAME,"${PACKAGE}", [package_name])
+AC_DEFINE_UNQUOTED(ASE_PKGVERSION,"${VERSION}", [package version])
+AC_DEFINE_UNQUOTED(ASE_PKGAUTHOR,"${PACKAGE_BUGREPORT}", [author's email address])

 # Defines extra options

--- a/ase/include/ase/config.h.in
+++ b/ase/include/ase/config.h.in
@ -18,7 +18,7 @@
 /* author's email address */
 #undef ASE_PKGAUTHOR

-/* package name */
+/* package_name */
 #undef ASE_PKGNAME

 /* package version */