More autotools

Makefile.am

@@ -27,12 +27,10 @@ pos:
 gmo:
 	echo "make gmo is obsolete, ignored."
 
-.PHONY: pdf
-pdf:
-	cd doc/manual/images && $(MAKE) pdf
-	cd doc/manual && $(MAKE) pdf
-	cd doc/reference/images && $(MAKE) pdf
-	cd doc/reference && $(MAKE) pdf
+.PHONY: pdf-local
+pdf-local:
+	cd doc/manual && $(MAKE) pdf-local
+	cd doc/reference && $(MAKE) pdf-local
 
 .PHONY: splitman
 splitman:

autogen.sh

@@ -1,25 +1,3 @@
 #! /bin/bash
-set -o errexit -o nounset -o pipefail
-IFS=$'\n'
-
-bstrap ()
-{
-    echo -n "Bootstrapping $1    "
-    if (cd "$1" && sh autogen.sh); then
-        echo "OK"
-    else
-        echo "ERROR"
-        exit 1
-    fi
-}
-
-bstrap "./lib-src/enet"
-
-echo -n "Bootstrapping ./    "
-if autoheader && aclocal -I m4 && automake --add-missing --foreign --copy && autoconf; then
-    echo "OK"
-else
-    echo "ERROR"
-    exit 1
-fi
-echo "You can now run configure and make."
+autoreconf --verbose --install --force \
+&& echo "You can now run configure and make."

build-aux/mkinstalldirs

@@ -1,28 +1,49 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2024-06-19.01; # UTC
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
-dirmode=""
+dirmode=
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
+      echo "$usage"
+      exit $?
       ;;
     -m)                         # -m PERM arg
       shift
       test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 (GNU Automake) $scriptversion"
+      exit $?
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,30 +71,63 @@ case $# in
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the 'mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because '.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "umask 22"
+      umask 22
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
 
+echo "umask 22"
+umask 22
+
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
   shift
+  IFS=$oIFS
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -84,28 +138,27 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
+	errstatus=$lasterr
       fi
     fi
 
-    pathcomp="$pathcomp/"
+    pathcomp=$pathcomp/
   done
+
+  if test ! -z "$dirmode"; then
+    echo "chmod $dirmode $file"
+    chmod "$dirmode" "$file" || errstatus=$?
+  fi
 done
 
 exit $errstatus
 
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
 # End:
-# mkinstalldirs ends here

configure.ac

@@ -7,7 +7,8 @@ AC_CONFIG_SRCDIR([src/enigma.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror])
+
 AC_CONFIG_HEADERS([src/config.h])
 AC_USE_SYSTEM_EXTENSIONS
 
@@ -51,6 +52,7 @@ AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_RANLIB
+AM_PROG_AR
 PKG_PROG_PKG_CONFIG
 
 dnl do not add the AC_PROG_CXX default CXXFLAGS
@@ -87,7 +89,6 @@ AC_SUBST([TOLUA])
 TOLUA=["\$(top_builddir)/tools/tolua"]
 dnl AC_PATH_PROG(TOLUA, tolua, "", ["\$(top_builddir)/tools/tolua"])
 
-
 dnl ======================================================================
 dnl Check for system headers
 dnl ======================================================================
@@ -181,10 +182,10 @@ else
          [[#if XERCES_VERSION_MAJOR < 2
            #error too old
            #else
-	   #if XERCES_VERSION_MAJOR == 2 && XERCES_VERSION_MINOR < 4
-	   #error too old
-	   #endif
-	   #endif
+           #if XERCES_VERSION_MAJOR == 2 && XERCES_VERSION_MINOR < 4
+           #error too old
+           #endif
+           #endif
            ]])],
          [AC_MSG_RESULT([found])],
          [AC_MSG_ERROR([Xerces >= 2.4 not found.])])
@@ -247,7 +248,7 @@ if test "x$enable_experimental" = xyes; then
 fi
 
 dnl ----------------------------------------
-dnl Include asserts ?
+dnl Include asserts?
 dnl ----------------------------------------
 AC_MSG_CHECKING([whether to include assert statements])
 AC_ARG_ENABLE([assert],
@@ -427,24 +428,24 @@ AC_CONFIG_FILES([Makefile
            data/soundsets/enigma/Makefile
            data/schemas/Makefile
            data/locale/Makefile
-	   doc/Makefile
-	   doc/images/Makefile
-	   doc/images/flags25x15/Makefile
-	   doc/manual/Makefile
-	   doc/manual/images/Makefile
-	   doc/reference/Makefile
-	   doc/reference/images/Makefile
-	   etc/Makefile
-	   lib-src/Makefile
-	   lib-src/oxydlib/Makefile
-	   lib-src/tinygettext/Makefile
-	   lib-src/lua/Makefile
+           doc/Makefile
+           doc/images/Makefile
+           doc/images/flags25x15/Makefile
+           doc/manual/Makefile
+           doc/manual/images/Makefile
+           doc/reference/Makefile
+           doc/reference/images/Makefile
+           etc/Makefile
+           lib-src/Makefile
+           lib-src/oxydlib/Makefile
+           lib-src/tinygettext/Makefile
+           lib-src/lua/Makefile
            lib-src/enigma-core/Makefile
-	   src/Makefile
-	   tools/Makefile
-	   etc/enigma.spec
-	   etc/enigma.nsi
-	   etc/Info.plist
+           src/Makefile
+           tools/Makefile
+           etc/enigma.spec
+           etc/enigma.nsi
+           etc/Info.plist
 ])
 
 AC_CONFIG_FILES([etc/mingw32-dist.sh], [chmod +x etc/mingw32-dist.sh])
@@ -461,8 +462,8 @@ Enigma is now configured
    C++ compiler:        $CXX $CXXFLAGS
    Libraries:           $LIBS
    Linker options:      $LDFLAGS
-   Languages:		$ALL_LINGUAS
-   System enet:		$system_enet
+   Languages:           $ALL_LINGUAS
+   System enet:         $system_enet
 
 If these values seem to make sense, you can now run make.
 ])

data/locale/Makefile.am

@@ -19,7 +19,10 @@ MSGMERGE = msgmerge
 MSGMERGE_UPDATE = $(MSGMERGE) --update
 MSGINIT = msginit
 
-DISTFILES = remove-potcdate.sin POTFILES.in $(PACKAGE).pot stamp-po $(wildcard $(srcdir)/*.po) Makefile.am Makefile.in
+DISTFILES.dist2 = remove-potcdate.sin POTFILES.in $(PACKAGE).pot stamp-po $(wildcard $(srcdir)/*.po) Makefile.am Makefile.in
+
+MOSTLYCLEANFILES = remove-potcdate.sed stamp-poT core core.* $(PACKAGE).po $(PACKAGE).1po $(PACKAGE).2po *.o *.po~
+DISTCLEANFILES = Makefile POTFILES level_i18n.cc
 
 # These two variables depend on the location of this directory.
 subdir = data/locale
@@ -134,25 +137,13 @@ $(srcdir)/$(PACKAGE).pot:
 	  exit 1; \
 	fi
 
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f stamp-poT
-	rm -f core core.* $(PACKAGE).po $(PACKAGE).1po $(PACKAGE).2po
-	rm -fr *.o
-	rm -f *.po~
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile POTFILES level_i18n.cc
-
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist:
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
-	dists="$(DISTFILES)"; \
+dist2: $(DISTFILES.dist2)
+	dists="$(DISTFILES.dist2)"; \
 	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
 	  if test -f $$file; then \
@@ -163,12 +154,10 @@ dist2: $(DISTFILES)
 	done
 
 .PHONY: update-po
-
 update-po: Makefile
 	$(MAKE) $(PACKAGE).pot-update
 	$(MAKE) *.po
 
 .PHONY: pos
-
 pos: update-po
 

doc/manual/Makefile.am

@@ -22,8 +22,13 @@ CLEANFILES = enigma{,_de,_fr,_ru}.html enigma{,_de,_fr}.pdf
 	  echo "Warning: texi2html not found"; \
 	fi
 
+.PHONY: pdf-local
+pdf-local:
+	$(MAKE) -C images
+	$(MAKE) pdf-files
+
 # No pdf file of russian manual because Texinfo does still NOT support cyrrillic characters in pdf output
-pdf: enigma.pdf enigma_de.pdf enigma_fr.pdf
+pdf-files: enigma.pdf enigma_de.pdf enigma_fr.pdf
 
 %.pdf: %.texi
 	texi2dvi --pdf $<