X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=acsite.m4;h=0971bef7dbea8986106068a3c39a96303461e172;hb=HEAD;hp=7bdfe0248b0ffd8ef72bc932e57d512ac944a737;hpb=349ccc7f5d161a4d10ac72cf16ea5073fe071b4e;p=oss%2Ffgis.git

diff --git a/acsite.m4 b/acsite.m4
index 7bdfe02..0971bef 100644
--- a/acsite.m4
+++ b/acsite.m4
@@ -20,12 +20,12 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([AC_DEFINE_DIR], [
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+  test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
   ac_define_dir=`eval echo [$]$2`
   ac_define_dir=`eval echo [$]ac_define_dir`
   ifelse($3, ,
-    AC_DEFINE_UNQUOTED($1, "$ac_define_dir"),
-    AC_DEFINE_UNQUOTED($1, "$ac_define_dir", $3))
+    [AC_DEFINE_UNQUOTED($1, "$ac_define_dir")],
+    [AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])])
 ])
 
 dnl ---------------------------------------------------------------------------
@@ -74,7 +74,7 @@ AC_DEFUN(CY_AC_PATH_TCLH, [
 #
 no_tcl=true
 AC_MSG_CHECKING(for Tcl private headers)
-AC_ARG_WITH(tclinclude, [  --with-tclinclude=DIR   directory where tcl private headers are], with_tclinclude=${withval})
+AC_ARG_WITH(tclinclude, [  --with-tclinclude[=DIR]   directory where tcl private headers are], with_tclinclude=${withval})
 AC_CACHE_VAL(ac_cv_c_tclh,[
 # first check to see if --with-tclinclude was specified
 if test x"${with_tclinclude}" != x ; then
@@ -189,7 +189,7 @@ AC_DEFUN(CY_AC_PATH_TCLCONFIG, [
 if test x"${no_tcl}" = x ; then
   # we reset no_tcl in case something fails here
   no_tcl=true
-  AC_ARG_WITH(tcl, [  --with-tcl           directory containing tcl configuration (tclConfig.sh)],
+  AC_ARG_WITH(tcl, [  --with-tcl[=DIR]          directory containing tcl configuration (tclConfig.sh)],
          with_tclconfig=${withval})
   AC_MSG_CHECKING([for Tcl configuration])
   AC_CACHE_VAL(ac_cv_c_tclconfig,[
@@ -368,7 +368,7 @@ AC_DEFUN(CY_AC_PATH_TKH, [
 #
 #no_tk=true
 AC_MSG_CHECKING(for Tk private headers)
-AC_ARG_WITH(tkinclude, [  --with-tkinclude       directory where tk private headers are], with_tkinclude=${withval})
+AC_ARG_WITH(tkinclude, [  --with-tkinclude[=DIR]    directory where tk private headers are], with_tkinclude=${withval})
 AC_CACHE_VAL(ac_cv_c_tkh,[
 # first check to see if --with-tkinclude was specified
 if test x"${with_tkinclude}" != x ; then
@@ -474,7 +474,7 @@ AC_DEFUN(CY_AC_PATH_TKCONFIG, [
 if test x"${no_tk}" = x ; then
   # we reset no_tk in case something fails here
   no_tk=true
-  AC_ARG_WITH(tk, [  --with-tk           directory containing tk configuration (tkConfig.sh)],
+  AC_ARG_WITH(tk, [  --with-tk[=DIR]           directory containing tk configuration (tkConfig.sh)],
          with_tkconfig=${withval})
   AC_MSG_CHECKING([for Tk configuration])
   AC_CACHE_VAL(ac_cv_c_tkconfig,[