Add autoheader protection and some more comments to explain what we're doing.

diff --git a/configure b/configure
index f2b2aa63088e7b634d7c7a1dda1603e88163200c..16bdcbca6f3034c58a0297d258e78f16a58ca36a 100755 (executable)
--- a/configure
+++ b/configure
@@ -3098,6 +3098,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
   # Make sure we can run config.sub.
 $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
@@ -7531,7 +7533,6 @@ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
 fi
 
 
-
 PICFLAG=1
 DSOFLAGS="${DSOFLAGS:=}"
 
@@ -8021,7 +8022,6 @@ case $host_os_name in
 esac
 
 
-
 ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/configure.ac b/configure.ac
index a1f9796e3a8826eef9919bcda85179e7c5019fcd..78e5b619ee8a705dda23b186bbb525b534b92dde 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,15 +15,19 @@ AC_PREREQ([2.60])
 dnl Package name and version...
 AC_INIT([CUPS], [2.4rc1], [https://github.com/openprinting/cups/issues], [cups], [https://openprinting.github.io/cups])
 
+dnl This line is provided to ensure that you don't run the autoheader program
+dnl against this project.  Doing so is completely unsupported and WILL cause
+dnl problems!
+AH_TOP([#error "Somebody ran autoheader on this project which is unsupported and WILL cause problems."])
+
+dnl Include configure tests for different areas...
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
-
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
-
 sinclude(config-scripts/cups-network.m4)
 sinclude(config-scripts/cups-poll.m4)
 sinclude(config-scripts/cups-gssapi.m4)
@@ -36,6 +40,8 @@ sinclude(config-scripts/cups-snap.m4)
 sinclude(config-scripts/cups-startup.m4)
 sinclude(config-scripts/cups-defaults.m4)
 
+dnl See what languages are available and make sure we generate the localization
+dnl files as needed...
 INSTALL_LANGUAGES=""
 UNINSTALL_LANGUAGES=""
 LANGFILES=""
@@ -59,6 +65,7 @@ AS_IF([test "x$LANGUAGES" != x], [
 AC_SUBST([INSTALL_LANGUAGES])
 AC_SUBST([UNINSTALL_LANGUAGES])
 
+dnl Provide autoconf with a list of files to generate and output them...
 AC_CONFIG_FILES([
     Makedefs
     conf/cups-files.conf