Commit e49f201 1 parent 275a66e commit e49f201 Copy full SHA for e49f201
File tree 9 files changed +13
-10
lines changed
9 files changed +13
-10
lines changed Original file line number Diff line number Diff line change 1
1
# Checks that autoconf has been run if configure.ac was updated
2
- # Assumes that autoconf 2.69 was run, the same as ubuntu 20 .04
2
+ # Assumes that autoconf 2.71 was run, the same as ubuntu 22 .04
3
3
name : Autoconf Up To Date
4
4
on :
5
5
pull_request :
Original file line number Diff line number Diff line change @@ -17,8 +17,8 @@ The script uses the file to generate `localoptions.h` with various features enab
17
17
Following are generated files in the format ` <target>: <generator>(<source>) `
18
18
```
19
19
- configure: autoconf(configure.ac)
20
- - config.h.in: autoheader(configure.ac)
21
- - config.h: configure(config.h.in)
20
+ - src/ config.h.in: autoheader(configure.ac)
21
+ - src/ config.h: configure(src/ config.h.in)
22
22
- Makefile: configure(Makefile.in)
23
23
- default_options_guard.h: make(default_options.h)
24
24
```
Original file line number Diff line number Diff line change 36
36
OBJ_DIR =./obj
37
37
MAN_DIR =@srcdir@/manpages
38
38
39
-
40
39
_COMMONOBJS =dbutil.o buffer.o dbhelpers.o \
41
40
dss.o bignum.o \
42
41
signkey.o rsa.o dbrandom.o \
@@ -277,7 +276,7 @@ thisclean:
277
276
$(OBJ_DIR ) /*
278
277
279
278
distclean : clean tidy
280
- -rm -f config.h config.status config.log
279
+ -rm -f src/ config.h config.status config.log
281
280
-rm -f Makefile test/Makefile
282
281
-rm -f default_options_guard.h
283
282
Original file line number Diff line number Diff line change @@ -2810,7 +2810,7 @@ as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
2810
2810
ac_aux_files=" config.guess config.sub"
2811
2811
2812
2812
# Locations in which to look for auxiliary files.
2813
- ac_aux_dir_candidates=" ${srcdir}${PATH_SEPARATOR}${srcdir} /.. ${PATH_SEPARATOR}${srcdir} /../.. "
2813
+ ac_aux_dir_candidates=" ${srcdir} /src "
2814
2814
2815
2815
# Search for a directory containing all of the required auxiliary files,
2816
2816
# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
8696
8696
# flags that should be set in Makefile but not for configure tests
8697
8697
CFLAGS=" $CFLAGS $LATE_CFLAGS "
8698
8698
8699
- ac_config_headers=" $ac_config_headers config.h"
8699
+
8700
+
8701
+ ac_config_headers=" $ac_config_headers config.h:src/config.h.in"
8700
8702
8701
8703
ac_config_files=" $ac_config_files Makefile $LIBTOM_FILES test/Makefile"
8702
8704
@@ -9384,7 +9386,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
9384
9386
for ac_config_target in $ac_config_targets
9385
9387
do
9386
9388
case $ac_config_target in
9387
- " config.h" ) CONFIG_HEADERS=" $CONFIG_HEADERS config.h" ;;
9389
+ " config.h" ) CONFIG_HEADERS=" $CONFIG_HEADERS config.h:src/config.h.in " ;;
9388
9390
" Makefile" ) CONFIG_FILES=" $CONFIG_FILES Makefile" ;;
9389
9391
" $LIBTOM_FILES " ) CONFIG_FILES=" $CONFIG_FILES $LIBTOM_FILES " ;;
9390
9392
" test/Makefile" ) CONFIG_FILES=" $CONFIG_FILES test/Makefile" ;;
Original file line number Diff line number Diff line change 888
888
# flags that should be set in Makefile but not for configure tests
889
889
CFLAGS="$CFLAGS $LATE_CFLAGS"
890
890
891
- AC_CONFIG_HEADERS ( [ config.h] )
891
+ AC_CONFIG_AUX_DIR ( [ src] )
892
+
893
+ AC_CONFIG_HEADERS ( [ config.h:src/config.h.in] )
892
894
AC_CONFIG_FILES ( Makefile $LIBTOM_FILES test/Makefile )
893
895
AC_OUTPUT
894
896
File renamed without changes.
Original file line number Diff line number Diff line change 1
- /* config.h.in. Generated from configure.ac by autoheader. */
1
+ /* src/ config.h.in. Generated from configure.ac by autoheader. */
2
2
3
3
/* Using AIX */
4
4
#undef AIX
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments