Skip to content

Commit e49f201

Browse files
committed
Move some autoconf files to src/
These don't need to clutter the top directory. configure was regenerated with autoconf 2.71-3 on ubuntu 23.04, which differs slightly from 2.71 in 22.04 (as used by the github action). So the lines such as "ac_cv_prog_cxx_cxx11=no" were manually reverted.
1 parent 275a66e commit e49f201

9 files changed

+13
-10
lines changed

.github/workflows/autoconf.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 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
33
name: Autoconf Up To Date
44
on:
55
pull_request:

DEVELOPING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The script uses the file to generate `localoptions.h` with various features enab
1717
Following are generated files in the format `<target>: <generator>(<source>)`
1818
```
1919
- 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)
2222
- Makefile: configure(Makefile.in)
2323
- default_options_guard.h: make(default_options.h)
2424
```

Makefile.in

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ endif
3636
OBJ_DIR=./obj
3737
MAN_DIR=@srcdir@/manpages
3838

39-
4039
_COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
4140
dss.o bignum.o \
4241
signkey.o rsa.o dbrandom.o \
@@ -277,7 +276,7 @@ thisclean:
277276
$(OBJ_DIR)/*
278277

279278
distclean: clean tidy
280-
-rm -f config.h config.status config.log
279+
-rm -f src/config.h config.status config.log
281280
-rm -f Makefile test/Makefile
282281
-rm -f default_options_guard.h
283282

configure

+5-3
Original file line numberDiff line numberDiff line change
@@ -2810,7 +2810,7 @@ as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
28102810
ac_aux_files="config.guess config.sub"
28112811

28122812
# 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"
28142814

28152815
# Search for a directory containing all of the required auxiliary files,
28162816
# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
@@ -8696,7 +8696,9 @@ fi
86968696
# flags that should be set in Makefile but not for configure tests
86978697
CFLAGS="$CFLAGS $LATE_CFLAGS"
86988698

8699-
ac_config_headers="$ac_config_headers config.h"
8699+
8700+
8701+
ac_config_headers="$ac_config_headers config.h:src/config.h.in"
87008702

87018703
ac_config_files="$ac_config_files Makefile $LIBTOM_FILES test/Makefile"
87028704

@@ -9384,7 +9386,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
93849386
for ac_config_target in $ac_config_targets
93859387
do
93869388
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" ;;
93889390
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
93899391
"$LIBTOM_FILES") CONFIG_FILES="$CONFIG_FILES $LIBTOM_FILES" ;;
93909392
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;

configure.ac

+3-1
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,9 @@ fi
888888
# flags that should be set in Makefile but not for configure tests
889889
CFLAGS="$CFLAGS $LATE_CFLAGS"
890890

891-
AC_CONFIG_HEADERS([config.h])
891+
AC_CONFIG_AUX_DIR([src])
892+
893+
AC_CONFIG_HEADERS([config.h:src/config.h.in])
892894
AC_CONFIG_FILES(Makefile $LIBTOM_FILES test/Makefile)
893895
AC_OUTPUT
894896

config.guess src/config.guess

File renamed without changes.

config.h.in src/config.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* config.h.in. Generated from configure.ac by autoheader. */
1+
/* src/config.h.in. Generated from configure.ac by autoheader. */
22

33
/* Using AIX */
44
#undef AIX

config.sub src/config.sub

File renamed without changes.

install-sh src/install-sh

File renamed without changes.

0 commit comments

Comments
 (0)