Skip to content

Commit

Permalink
Move some autoconf files to src/
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mkj committed Dec 17, 2023
1 parent 275a66e commit e49f201
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autoconf.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Checks that autoconf has been run if configure.ac was updated
# Assumes that autoconf 2.69 was run, the same as ubuntu 20.04
# Assumes that autoconf 2.71 was run, the same as ubuntu 22.04
name: Autoconf Up To Date
on:
pull_request:
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The script uses the file to generate `localoptions.h` with various features enab
Following are generated files in the format `<target>: <generator>(<source>)`
```
- configure: autoconf(configure.ac)
- config.h.in: autoheader(configure.ac)
- config.h: configure(config.h.in)
- src/config.h.in: autoheader(configure.ac)
- src/config.h: configure(src/config.h.in)
- Makefile: configure(Makefile.in)
- default_options_guard.h: make(default_options.h)
```
Expand Down
3 changes: 1 addition & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ endif
OBJ_DIR=./obj
MAN_DIR=@srcdir@/manpages


_COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
dss.o bignum.o \
signkey.o rsa.o dbrandom.o \
Expand Down Expand Up @@ -277,7 +276,7 @@ thisclean:
$(OBJ_DIR)/*

distclean: clean tidy
-rm -f config.h config.status config.log
-rm -f src/config.h config.status config.log
-rm -f Makefile test/Makefile
-rm -f default_options_guard.h

Expand Down
8 changes: 5 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2810,7 +2810,7 @@ as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
ac_aux_files="config.guess config.sub"

# Locations in which to look for auxiliary files.
ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
ac_aux_dir_candidates="${srcdir}/src"

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

ac_config_headers="$ac_config_headers config.h"


ac_config_headers="$ac_config_headers config.h:src/config.h.in"

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

Expand Down Expand Up @@ -9384,7 +9386,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:src/config.h.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"$LIBTOM_FILES") CONFIG_FILES="$CONFIG_FILES $LIBTOM_FILES" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
Expand Down
4 changes: 3 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,9 @@ fi
# flags that should be set in Makefile but not for configure tests
CFLAGS="$CFLAGS $LATE_CFLAGS"

AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([src])

AC_CONFIG_HEADERS([config.h:src/config.h.in])
AC_CONFIG_FILES(Makefile $LIBTOM_FILES test/Makefile)
AC_OUTPUT

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion config.h.in → src/config.h.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* src/config.h.in. Generated from configure.ac by autoheader. */

/* Using AIX */
#undef AIX
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit e49f201

Please sign in to comment.