diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-23 15:26:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-23 15:26:15 (GMT) |
| commit | b7fdd1e846050be4e23fa920bf275653f0ad2829 (patch) | |
| tree | a5b823d1b3bfe1ee967fae23bbb18b817e0b5f85 /unix | |
| parent | a2594721f110178369e5c0cb5d981c4678a10708 (diff) | |
| parent | ca27387956e16b5983011ccf2205e9e1229a03a6 (diff) | |
| download | tk-b7fdd1e846050be4e23fa920bf275653f0ad2829.zip tk-b7fdd1e846050be4e23fa920bf275653f0ad2829.tar.gz tk-b7fdd1e846050be4e23fa920bf275653f0ad2829.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/configure.ac | 2 | ||||
| -rw-r--r-- | unix/tkConfig.h.in | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure index 065c0bf..d528c32 100755 --- a/unix/configure +++ b/unix/configure @@ -6961,9 +6961,7 @@ printf "%s\n" "$ac_cv_c_bigendian" >&6; } no) ;; #( universal) - -printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - + # ;; #( *) as_fn_error $? "unknown endianness @@ -9161,7 +9159,6 @@ LTLIBOBJS=$ac_ltlibobjs CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS="" - : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files diff --git a/unix/configure.ac b/unix/configure.ac index 38eda9d..c2c20f4 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -130,7 +130,7 @@ SC_TCL_64BIT_FLAGS # Check endianness because we can optimize some operations #-------------------------------------------------------------------- -AC_C_BIGENDIAN +AC_C_BIGENDIAN(,,,[#]) #------------------------------------------------------------------------ # If Tcl and Tk are installed in different places, adjust the library diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in index d78edb4..2f6eca6 100644 --- a/unix/tkConfig.h.in +++ b/unix/tkConfig.h.in @@ -4,9 +4,6 @@ #ifndef _TKCONFIG #define _TKCONFIG -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - /* Define to 1 if you have the <AvailabilityMacros.h> header file. */ #undef HAVE_AVAILABILITYMACROS_H |