Skip to content

Commit 32583fa

Browse files
committed
Convert Modules/Setup into a template file
1 parent 75b3935 commit 32583fa

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Misc/python-embed.pc
6666
Misc/python-config.sh
6767
Modules/Setup.config
6868
Modules/Setup.local
69+
Modules/Setup
6970
Modules/config.c
7071
Modules/ld_so_aix
7172
Programs/_freeze_module

Makefile.pre.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,12 +749,13 @@ oldsharedmods: $(SHAREDMODS) pybuilddir.txt
749749
fi; \
750750
done
751751

752-
752+
Modules/Setup: $(srcdir)/Modules/Setup.in
753+
./config.status --file=$@
753754

754755
Makefile Modules/config.c: Makefile.pre \
755756
$(srcdir)/Modules/config.c.in \
756757
$(MAKESETUP) \
757-
$(srcdir)/Modules/Setup \
758+
Modules/Setup \
758759
Modules/Setup.local
759760
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
760761
-s Modules \
File renamed without changes.

configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21350,7 +21350,7 @@ fi
2135021350

2135121351

2135221352
# generate output files
21353-
ac_config_files="$ac_config_files Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh"
21353+
ac_config_files="$ac_config_files Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh Modules/Setup"
2135421354

2135521355
ac_config_files="$ac_config_files Modules/ld_so_aix"
2135621356

@@ -22139,6 +22139,7 @@ do
2213922139
"Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
2214022140
"Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
2214122141
"Misc/python-config.sh") CONFIG_FILES="$CONFIG_FILES Misc/python-config.sh" ;;
22142+
"Modules/Setup") CONFIG_FILES="$CONFIG_FILES Modules/Setup" ;;
2214222143
"Modules/ld_so_aix") CONFIG_FILES="$CONFIG_FILES Modules/ld_so_aix" ;;
2214322144

2214422145
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6147,7 +6147,7 @@ fi
61476147
AC_SUBST(TEST_MODULES)
61486148

61496149
# generate output files
6150-
AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh)
6150+
AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh Modules/Setup)
61516151
AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
61526152
AC_OUTPUT
61536153

0 commit comments

Comments
 (0)