[as-devel] [PATCH] Fix escaping []'s for configure defaults
CaT (cat@zip.com.au)
Tue, 10 Jun 2003 17:27:51 +1000
--IJpNTDwzlM2Ie8A6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
This is so that the square brackets used to indicate a default value
actually translate from configure.in to configure with autoconf2.50.
Presently they vanish into the nether regions of m4 and so never
appear in the configure script. autoconf will need to be rerun after
this patch so that a nice happy configure file is generated.
Patch is attached.
--
Martin's distress was in contrast to the bitter satisfaction of some
of his fellow marines as they surveyed the scene. "The Iraqis are sick
people and we are the chemotherapy," said Corporal Ryan Dupre. "I am
starting to hate this country. Wait till I get hold of a friggin' Iraqi.
No, I won't get hold of one. I'll just kill him."
- http://www.informationclearinghouse.info/article2479.htm
--IJpNTDwzlM2Ie8A6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="afterstep-cvs20030610.configcleardefaults.patch"
diff -aur afterstep-stable.static/autoconf/configure.in afterstep-stable/autoconf/configure.in
--- afterstep-stable.static/autoconf/configure.in Sat May 31 08:30:05 2003
+++ afterstep-stable/autoconf/configure.in Tue Jun 10 17:21:58 2003
@@ -33,38 +33,38 @@
eval "includedir=$includedir"
dnl# directories
-AC_ARG_WITH(gnustep_dir, [ --with-gnustep-dir=DIR GNUstep directory [~/GNUstep] ],with_gnustep_dir=$withval, with_gnustep_dir="~/GNUstep")
-AC_ARG_WITH(gnustep_lib, [ --with-gnustep-lib=DIR GNUstep/Library directory [Library] ],with_gnustep_lib=$withval, with_gnustep_lib="Library")
-AC_ARG_WITH(afterdir, [ --with-afterdir=DIR user AfterStep dir [AfterStep] ],with_afterdir=$withval, with_afterdir="AfterStep")
+AC_ARG_WITH(gnustep_dir, [ --with-gnustep-dir=DIR GNUstep directory [[~/GNUstep]] ],with_gnustep_dir=$withval, with_gnustep_dir="~/GNUstep")
+AC_ARG_WITH(gnustep_lib, [ --with-gnustep-lib=DIR GNUstep/Library directory [[Library]] ],with_gnustep_lib=$withval, with_gnustep_lib="Library")
+AC_ARG_WITH(afterdir, [ --with-afterdir=DIR user AfterStep dir [[AfterStep]] ],with_afterdir=$withval, with_afterdir="AfterStep")
dnl# helper apps
-AC_ARG_WITH(imageloader, [ --with-imageloader=APP used to display non-XPMs [xli -onroot -quiet] ],with_imageloader=$withval, with_imageloader="xli -onroot -quiet -colors 20")
-AC_ARG_WITH(helpcommand, [ --with-helpcommand=APP display manpage for window [xiterm -e man] ],with_helpcommand=$withval, with_helpcommand="xiterm -e man")
-AC_ARG_WITH(soundplayer, [ --with-soundplayer=APP used to play sounds from Audio [play] (from SOX package)],with_soundplayer=$withval, with_soundplayer="play")
+AC_ARG_WITH(imageloader, [ --with-imageloader=APP used to display non-XPMs [[xli -onroot -quiet]] ],with_imageloader=$withval, with_imageloader="xli -onroot -quiet -colors 20")
+AC_ARG_WITH(helpcommand, [ --with-helpcommand=APP display manpage for window [[xiterm -e man]] ],with_helpcommand=$withval, with_helpcommand="xiterm -e man")
+AC_ARG_WITH(soundplayer, [ --with-soundplayer=APP used to play sounds from Audio [[play]] (from SOX package)],with_soundplayer=$withval, with_soundplayer="play")
dnl# look defaults
-AC_ARG_WITH(startsort, [ --with-startsort=METHOD start menu sorting method [SORTBYALPHA] ],with_startsort=$withval, with_startsort="SORTBYALPHA")
+AC_ARG_WITH(startsort, [ --with-startsort=METHOD start menu sorting method [[SORTBYALPHA]] ],with_startsort=$withval, with_startsort="SORTBYALPHA")
AC_ARG_ENABLE(different_looknfeels, [ --enable-different-looknfeels
- different look&feel for each desktop [no] ],enable_different_looknfeels=$enableval,enable_different_looknfeels="no")
-AC_ARG_WITH(desktops, [ --with-desktops=DESKS default desktops in pager [4] ],with_desktops=$withval, with_desktops="4")
-AC_ARG_WITH(deskgeometry, [ --with-deskgeometry=GEOM desktop views as COLUMNSxROWS [2x2] ],with_deskgeometry=$withval, with_deskgeometry="2x2")
+ different look&feel for each desktop [[no]] ],enable_different_looknfeels=$enableval,enable_different_looknfeels="no")
+AC_ARG_WITH(desktops, [ --with-desktops=DESKS default desktops in pager [[4]] ],with_desktops=$withval, with_desktops="4")
+AC_ARG_WITH(deskgeometry, [ --with-deskgeometry=GEOM desktop views as COLUMNSxROWS [[2x2]] ],with_deskgeometry=$withval, with_deskgeometry="2x2")
with_desktops_1=`expr ${with_desktops} - 1`
dnl# The following is passed directly to libAfterImage configure :
-AC_ARG_WITH(xpm, [ --with-xpm support XPM image format [yes]])
-AC_ARG_WITH(builtin_xpm, [ --with-builtin-xpm use builtin XPM parsing/handling instead of libXpm [yes]])
+AC_ARG_WITH(xpm, [ --with-xpm support XPM image format [[yes]]])
+AC_ARG_WITH(builtin_xpm, [ --with-builtin-xpm use builtin XPM parsing/handling instead of libXpm [[yes]]])
AC_ARG_WITH(xpm_includes, [ --with-xpm-includes=DIR use libXpm includes in DIR( when builtin XPM handling is disabled )], xpm_includes="$withval", xpm_includes=NO)
-AC_ARG_WITH(jpeg, [ --with-jpeg support JPEG image format [yes]])
+AC_ARG_WITH(jpeg, [ --with-jpeg support JPEG image format [[yes]]])
AC_ARG_WITH(jpeg_includes, [ --with-jpeg-includes=DIR use JPEG includes in DIR], jpeg_includes="$withval", jpeg_includes=NO)
-AC_ARG_WITH(png, [ --with-png support PNG image format [yes]])
+AC_ARG_WITH(png, [ --with-png support PNG image format [[yes]]])
AC_ARG_WITH(png_includes, [ --with-png-includes=DIR use PNG includes in DIR], png_includes="$withval", png_includes=NO)
-AC_ARG_WITH(ungif, [ --with-ungif support GIF image format using libungif [yes]])
-AC_ARG_WITH(gif, [ --with-gif support GIF image format using libgif [no]])
+AC_ARG_WITH(ungif, [ --with-ungif support GIF image format using libungif [[yes]]])
+AC_ARG_WITH(gif, [ --with-gif support GIF image format using libgif [[no]]])
AC_ARG_WITH(gif_includes, [ --with-gif-includes=DIR use GIF includes in DIR], gif_includes="$withval", gif_includes=NO)
-AC_ARG_WITH(tiff, [ --with-tiff support TIFF image format [yes]])
+AC_ARG_WITH(tiff, [ --with-tiff support TIFF image format [[yes]]])
AC_ARG_WITH(tiff_includes, [ --with-tiff-includes=DIR use TIFF includes in DIR], tiff_includes="$withval", tiff_includes=NO)
-AC_ARG_WITH(tff, [ --with-ttf support True Type Fonts via FreeType library [yes]])
+AC_ARG_WITH(tff, [ --with-ttf support True Type Fonts via FreeType library [[yes]]])
AC_ARG_WITH(tff_includes, [ --with-ttf-includes=DIR use FreeType includes in DIR], ttf_includes="$withval", ttf_includes=NO)
AC_ARG_WITH(afterbase_includes, [ --with-afterbase-includes=DIR use libAfterBase includes in DIR], afterbase_includes="$withval", afterbase_includes=NO)
@@ -73,39 +73,39 @@
AC_ARG_WITH(afterimage_lib, [ --with-afterimage-lib=DIR use libAfterImage library located in DIR], afterimage_lib="$withval", afterimage_lib=NO)
dnl# compile-time switches
-AC_ARG_ENABLE(pagerbackground, [ --enable-pagerbackground provide background support with the Pager [yes] ],enable_pagerbackground=$enableval,enable_pagerbackground="yes")
-AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [no] ],enable_i18n=$enableval,enable_i18n="no")
-AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [no] ],enable_xlocale=$enableval,enable_xlocale="no")
-AC_ARG_ENABLE(menuwarp, [ --enable-menuwarp warp mouse pointer to menus [no] ],enable_menuwarp=$enableval,enable_menuwarp="no")
-AC_ARG_ENABLE(savewindows, [ --enable-savewindows save windows and re-open next session [yes] ],enable_savewindows=$enableval,enable_savewindows="yes")
-AC_ARG_ENABLE(texture, [ --enable-texture support gradient, XPM, and JPEG textures [yes] ],enable_texure=$enableval,enable_texture="yes")
-AC_ARG_ENABLE(shade, [ --enable-shade support shaded windows [yes] ],enable_shade=$enableval,enable_shade="yes")
-AC_ARG_ENABLE(virtual, [ --enable-virtual support virtual desktops [yes] ],enable_virtual=$enableval,enable_virtual="yes")
-AC_ARG_ENABLE(saveunders, [ --enable-saveunders request saveunders for menus [yes] ],enable_saveunders=$enableval,enable_saveunders="yes")
-AC_ARG_ENABLE(windowlist, [ --enable-windowlist compile built-in window-list [yes] ],enable_windowlist=$enableval,enable_windowlist="yes")
-AC_ARG_ENABLE(availability, [ --enable-availability check for unavailable binaries [yes] ],enable_availability=$enableval,enable_availability="yes")
-AC_ARG_ENABLE(fixeditems, [ --enable-fixeditems enable fixed menu entries [no] ], enable_fixeditems=$enableval,enable_fixeditems="no")
-AC_ARG_ENABLE(ascp, [ --enable-ascp build AfterStep Control Panel [yes] ], enable_ascp=$enableval,enable_ascp="yes")
+AC_ARG_ENABLE(pagerbackground, [ --enable-pagerbackground provide background support with the Pager [[yes]] ],enable_pagerbackground=$enableval,enable_pagerbackground="yes")
+AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [[no]] ],enable_i18n=$enableval,enable_i18n="no")
+AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [[no]] ],enable_xlocale=$enableval,enable_xlocale="no")
+AC_ARG_ENABLE(menuwarp, [ --enable-menuwarp warp mouse pointer to menus [[no]] ],enable_menuwarp=$enableval,enable_menuwarp="no")
+AC_ARG_ENABLE(savewindows, [ --enable-savewindows save windows and re-open next session [[yes]] ],enable_savewindows=$enableval,enable_savewindows="yes")
+AC_ARG_ENABLE(texture, [ --enable-texture support gradient, XPM, and JPEG textures [[yes]] ],enable_texure=$enableval,enable_texture="yes")
+AC_ARG_ENABLE(shade, [ --enable-shade support shaded windows [[yes]] ],enable_shade=$enableval,enable_shade="yes")
+AC_ARG_ENABLE(virtual, [ --enable-virtual support virtual desktops [[yes]] ],enable_virtual=$enableval,enable_virtual="yes")
+AC_ARG_ENABLE(saveunders, [ --enable-saveunders request saveunders for menus [[yes]] ],enable_saveunders=$enableval,enable_saveunders="yes")
+AC_ARG_ENABLE(windowlist, [ --enable-windowlist compile built-in window-list [[yes]] ],enable_windowlist=$enableval,enable_windowlist="yes")
+AC_ARG_ENABLE(availability, [ --enable-availability check for unavailable binaries [[yes]] ],enable_availability=$enableval,enable_availability="yes")
+AC_ARG_ENABLE(fixeditems, [ --enable-fixeditems enable fixed menu entries [[no]] ], enable_fixeditems=$enableval,enable_fixeditems="no")
+AC_ARG_ENABLE(ascp, [ --enable-ascp build AfterStep Control Panel [[yes]] ], enable_ascp=$enableval,enable_ascp="yes")
AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ],with_locale=$withval,with_locale="")
-AC_ARG_ENABLE(shaping, [ --enable-shaping support shaped windows [yes] ],enable_shaping=$enableval,enable_shaping="yes")
-AC_ARG_ENABLE(xinerama, [ --enable-xinerama support Xinerama Multihead extentions [yes] ],enable_xinerama=$enableval,enable_xinerama="yes")
-AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libafterstep statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="yes")
-
-AC_ARG_WITH(libefence, [ --with-libefence compile with libefence to debug buffer overruns [no] ],with_libefence=$withval,with_libefence="")
-AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [no] ],enable_gdb=$enableval,enable_gdb="no")
-AC_ARG_ENABLE(sigsegv, [ --enable-sigsegv enable internal handler of Segmentation Fault (for self-diagnostics) [yes] ],enable_sigsegv=$enableval,enable_sigsegv="yes")
-AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [no] ],enable_warn=$enableval,enable_warn="no")
-AC_ARG_ENABLE(gprof, [ --enable-gprof add gprof symbols (-pg) (for debugging) [no] ],enable_gprof=$enableval,enable_gprof="no")
-AC_ARG_ENABLE(audit, [ --enable-audit memory usage audit (for debugging) [no] ],enable_audit=$enableval,enable_audit="no")
-AC_ARG_ENABLE(trace, [ --enable-trace some function calls tracing (see include/trace.h) (for debugging) [no] ],enable_trace=$enableval,enable_trace="no")
-AC_ARG_ENABLE(trace-x, [ --enable-trace-x trace X calls (runtime option) (for debugging) [no] ],enable_trace_x=$enableval,enable_trace_x="no")
+AC_ARG_ENABLE(shaping, [ --enable-shaping support shaped windows [[yes]] ],enable_shaping=$enableval,enable_shaping="yes")
+AC_ARG_ENABLE(xinerama, [ --enable-xinerama support Xinerama Multihead extentions [[yes]] ],enable_xinerama=$enableval,enable_xinerama="yes")
+AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libafterstep statically [[yes]] ],enable_staticlibs=$enableval,enable_staticlibs="yes")
+
+AC_ARG_WITH(libefence, [ --with-libefence compile with libefence to debug buffer overruns [[no]] ],with_libefence=$withval,with_libefence="")
+AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [[no]] ],enable_gdb=$enableval,enable_gdb="no")
+AC_ARG_ENABLE(sigsegv, [ --enable-sigsegv enable internal handler of Segmentation Fault (for self-diagnostics) [[yes]] ],enable_sigsegv=$enableval,enable_sigsegv="yes")
+AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [[no]] ],enable_warn=$enableval,enable_warn="no")
+AC_ARG_ENABLE(gprof, [ --enable-gprof add gprof symbols (-pg) (for debugging) [[no]] ],enable_gprof=$enableval,enable_gprof="no")
+AC_ARG_ENABLE(audit, [ --enable-audit memory usage audit (for debugging) [[no]] ],enable_audit=$enableval,enable_audit="no")
+AC_ARG_ENABLE(trace, [ --enable-trace some function calls tracing (see include/trace.h) (for debugging) [[no]] ],enable_trace=$enableval,enable_trace="no")
+AC_ARG_ENABLE(trace-x, [ --enable-trace-x trace X calls (runtime option) (for debugging) [[no]] ],enable_trace_x=$enableval,enable_trace_x="no")
AC_ARG_ENABLE(mmx_optimization,
- [ --enable-mmx-optimization enable utilization of MMX instruction set to speed up imaging operations [yes] ],enable_mmx_optimization=$enableval,enable_mmx_optimization="yes")
+ [ --enable-mmx-optimization enable utilization of MMX instruction set to speed up imaging operations [[yes]] ],enable_mmx_optimization=$enableval,enable_mmx_optimization="yes")
-AC_ARG_ENABLE(script, [ --enable-script compile Script module [yes] ], enable_script=$enableval,enable_script="yes")
-AC_ARG_ENABLE(reuse-font, [ --enable-reuse-font enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[no] ],[if test x$enableval == "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT) fi],enable_script="yes")
+AC_ARG_ENABLE(script, [ --enable-script compile Script module [[yes]] ], enable_script=$enableval,enable_script="yes")
+AC_ARG_ENABLE(reuse-font, [ --enable-reuse-font enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval == "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT) fi],enable_script="yes")
dnl# Comman stuff : compiler tools, proggies, etc.
--IJpNTDwzlM2Ie8A6--