1 files changed, 21 insertions, 35 deletions
diff --git a/Build/source/withenable.ac b/Build/source/withenable.ac
index bfb217ec24e..5608ea996e6 100644
--- a/Build/source/withenable.ac
+++ b/Build/source/withenable.ac
@@ -1,39 +1,25 @@
 # withenable.ac - Written long ago by Thomas Esser and Sebastian Rahtz.
 # Public domain.
-# Options to avoid/include the packages in utils/.
-# 
-AC_ARG_ENABLE([multiplatform],
-	[  --enable-multiplatform  put executables in bin/PLATFORM])
-
-AC_ARG_WITH([dialog],
-        [  --without-dialog        do not build the dialog package])
-
-AC_ARG_WITH([mkjobtexmf],
-        [  --without-mkjobtexmf    do not build the mkjobtexmf package])
-
-AC_ARG_WITH([pdfopen],
-        [  --without-pdfopen       do not build the pdfopen package])
-
-AC_ARG_WITH([ps2eps],
-        [  --without-ps2eps        do not build the ps2eps package])
-
-AC_ARG_WITH([psutils],
-        [  --without-psutils       do not build the psutils package])
 
-AC_ARG_WITH([sam2p],
-        [  --without-sam2p         do not build the sam2p package])
-
-AC_ARG_WITH([t1utils],
-        [  --without-t1utils       do not build the t1utils package])
-
-AC_ARG_WITH([texcount],
-        [  --without-texcount    do not build the texcount package])
-
-AC_ARG_WITH([texi2html],
-        [  --without-texi2html     do not build the texi2html package])
-
-AC_ARG_WITH([texinfo],
-        [  --without-texinfo       do not build the texinfo package])
+AC_ARG_ENABLE([multiplatform],
+  [AS_HELP_STRING([--enable-multiplatform],
+     [put executables into bin/PLATFORM and libraries into lib/PLATFORM])])dnl
+
+dnl list of optional packages in utils/, i.e., subdirs of utils/
+dnl
+m4_define([kpse_utils_pkglist], [
+dialog
+mkjobtexmf
+pdfopen
+ps2eps
+psutils
+t1utils
+texcount 
+texi2html
+texinfo
+tpic2pdftex
+])
 
-AC_ARG_WITH([tpic2pdftex],
-        [  --without-tpic2pdftex   do not build the tpic2pdftex package])
+# Options to avoid/include the packages in utils/.
+# 
+KPSE_WITH_SUBDIRS(kpse_utils_pkglist)