X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=enscript.git;a=blobdiff_plain;f=configure.ac;h=d481ed02d508e82a17229826e88de16d4159438b;hp=5aca44dae09684046f1ff6e1fa338c305eaade98;hb=c646cf316ff39592e23ecd9ce26374c197d58ff4;hpb=23d92d23645b2a1b5c8134334506b90c90c01ad5

diff --git a/configure.ac b/configure.ac
index 5aca44d..d481ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,25 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(GNU Enscript, 1.6.4, bug-enscript@gnu.org)
+AC_INIT([GNU Enscript],[1.6.6],[bug-enscript@gnu.org])
+AC_PREREQ([2.61])
 AC_CONFIG_SRCDIR([src/gsint.h])
-
-AC_PREREQ(2.57)
+AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
-
-AC_REVISION($Revision: 1.1.1.1 $)
 
 AC_PROG_INSTALL
 
 AC_PROG_CC
 
-AC_ISC_POSIX
-AM_C_PROTOTYPES
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_C_CONST
 AC_FUNC_ALLOCA
+dnl its save to say that in 2023 all compilers support prototypes
+AC_DEFINE([PROTOTYPES], [1], [Define to 1 if your compiler supports function prototypes.])
 
-AC_STDC_HEADERS
-AC_HAVE_HEADERS(string.h stdlib.h unistd.h stdarg.h math.h pwd.h)
-AC_HAVE_HEADERS(sys/types.h sys/stat.h)
+AC_HEADER_STDC
+AC_CHECK_HEADERS([string.h stdlib.h unistd.h stdarg.h math.h pwd.h])
+AC_CHECK_HEADERS([sys/types.h sys/stat.h])
 
 dnl Check some functions.
 AC_CHECK_FUNCS(strchr getcwd)
@@ -69,6 +67,23 @@ AC_ARG_WITH(media,
 MEDIA=$ac_cv_value_media
 AC_SUBST(MEDIA)
 
+dnl Define the default input encoding.
+AC_ARG_WITH(encoding,
+[  --with-encoding(=ENCODING) use input encoding (ENCODING), default is latin1],
+  if test "X$withval" != "Xno"; then
+    if test "X$withval" = "Xyes"; then
+      ac_cv_value_encoding='latin1'
+    else
+      ac_cv_value_encoding=$withval
+    fi
+  else
+    ac_cv_value_encoding=${ENCODING-latin1}
+  fi,
+  ac_cv_value_encoding=${ENCODING-latin1}
+)
+ENCODING=$ac_cv_value_encoding
+AC_SUBST(ENCODING)
+
 dnl Find the printer spooler command.
 
 AC_CHECK_PROG(SPOOLER, lpr, lpr)
@@ -99,12 +114,14 @@ AC_ARG_WITH(ps-level,
 AC_SUBST(PSLEVEL)
 
 dnl Internationalization.
-ALL_LINGUAS="de es fi fr nl ru sl"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.21.1])
 
 dnl Path separator character.
-AC_DEFINE_UNQUOTED(PATH_SEPARATOR, ':')
-AC_DEFINE_UNQUOTED(PATH_SEPARATOR_STR, ":")
+AC_DEFINE_UNQUOTED([PATH_SEPARATOR], [':'],
+  [Character used to separate path components.])
+AC_DEFINE_UNQUOTED([PATH_SEPARATOR_STR], [":"],
+  [Character used to separate path components, as string.])
 
 dnl
 dnl Scripts
@@ -119,7 +136,7 @@ dnl substitutions
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
-AC_CONFIG_FILES([Makefile  po/Makefile.in m4/Makefile  intl/Makefile po/Makefile \
+AC_CONFIG_FILES([Makefile      po/Makefile.in\
 	compat/Makefile \
 	afm/Makefile \
 	afmlib/Makefile \
@@ -132,7 +149,7 @@ AC_CONFIG_FILES([Makefile  po/Makefile.in m4/Makefile  intl/Makefile po/Makefile
 	states/tests/Makefile \
 	docs/Makefile \
 	w32/Makefile])
-AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h ]], [[]])
+
 AC_OUTPUT
 
 echo ""
@@ -144,6 +161,7 @@ echo ""
 echo "Option     Change with configure's option   Current value"
 echo "---------------------------------------------------------"
 echo "Media      --with-media=MEDIA               $MEDIA"
+echo "Encoding   --with-encoding=ENCODING         $ENCODING"
 echo "Spooler    --with-spooler=SPOOLER           $SPOOLER"
 echo "PS level   --with-ps-level=LEVEL            $PSLEVEL"
 echo ""