diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-04-12 09:58:45 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-04-12 09:58:45 +0000 |
| commit | 0036cbae58a22b2bc8ae2673ae30c0c24a8c1a00 (patch) | |
| tree | c4b92bdd0a31d750d573bf7fc58b41af35ce220d | |
| parent | 0b6964b5692791f8c0eff9022314b187829a852e (diff) | |
| download | cpython-git-0036cbae58a22b2bc8ae2673ae30c0c24a8c1a00.tar.gz | |
Remove acconfig.h.
| -rw-r--r-- | acconfig.h | 9 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | pyconfig.h.in | 34 |
4 files changed, 10 insertions, 41 deletions
diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index b03ae92240..0000000000 --- a/acconfig.h +++ /dev/null @@ -1,9 +0,0 @@ -/* Leave this blank line here -- autoheader needs it! */ - - - - -/* Leave that blank line there-- autoheader needs it! */ - -@BOTTOM@ - @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.304 . +# From configure.in Revision: 1.305 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -14947,6 +14947,8 @@ then enable_unicode="ucs2" fi + + case "$enable_unicode" in ucs2) unicode_size="2" cat >>confdefs.h <<\_ACEOF @@ -14965,6 +14967,7 @@ esac + if test "$enable_unicode" = "no" then UNICODE_OBJS="" diff --git a/configure.in b/configure.in index 3cb8c68486..7f49dcca0b 100644 --- a/configure.in +++ b/configure.in @@ -2084,6 +2084,8 @@ then enable_unicode="ucs2" fi +AH_TEMPLATE(Py_UNICODE_SIZE, + [Define as the size of the unicode type.]) case "$enable_unicode" in ucs2) unicode_size="2" AC_DEFINE(Py_UNICODE_SIZE,2) @@ -2095,6 +2097,7 @@ esac AH_TEMPLATE(PY_UNICODE_TYPE, [Define as the integral type used for Unicode representation.]) + AC_SUBST(UNICODE_OBJS) if test "$enable_unicode" = "no" then diff --git a/pyconfig.h.in b/pyconfig.h.in index d04b4c9671..5ad717b902 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -1,34 +1,4 @@ /* pyconfig.h.in. Generated from configure.in by autoheader. */ -/* Leave this blank line here -- autoheader needs it! */ - - -/* Define this if you have gethostbyname() */ -#undef HAVE_GETHOSTBYNAME - -/* Define if you have termios available */ -#undef HAVE_TERMIOS_H - -/* Define as the size of the unicode type. */ -#undef Py_UNICODE_SIZE - -/* sizeof(void *) */ -#undef SIZEOF_VOID_P - -/* Define to `int' if <sys/types.h> doesn't define. */ -#undef socklen_t - -/* Define for SOLARIS 2.x */ -#undef SOLARIS - -/* Define if you want to use BSD db. */ -#undef WITH_LIBDB - -/* Define if you want to use ndbm. */ -#undef WITH_LIBNDBM - - -/* Leave that blank line there-- autoheader needs it! */ - /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want support for AIX C++ shared extension modules. */ @@ -650,6 +620,9 @@ /* Define if you want to build an interpreter with many run-time checks. */ #undef Py_DEBUG +/* Define as the size of the unicode type. */ +#undef Py_UNICODE_SIZE + /* Define if you want to have a Unicode type. */ #undef Py_USING_UNICODE @@ -855,4 +828,3 @@ #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ #endif - |