Add the new silent-rules options to the list of known configure opts

[sxemacs] / m4 / sxe-aux.m4

diff --git a/m4/sxe-aux.m4 b/m4/sxe-aux.m4
index 2a930ed..240a09e 100644 (file)
--- a/m4/sxe-aux.m4
+++ b/m4/sxe-aux.m4
@@ -86,7 +86,7 @@ m4_define([__SXE_MAKE_ADDER], [
                        ]SXE_ADD_[]$1[]_OBJ([$i])[
                done
        ])dnl
-       
+
        m4_define([SXE_SUBST_]$1[_OBJS], [
                AC_SUBST($2_objs)
                ## subst additional vars
@@ -132,9 +132,6 @@ __SXE_MAKE_ADDER([SXEUITTY], [libsxeuiTTY])
 dnl creates SXE_ADD_SXEUI_{OBJ,OBJS}
 __SXE_MAKE_ADDER([SXEUIX11], [libsxeuiX11])
 
-dnl creates SXE_ADD_SXEUI_{OBJ,OBJS}
-__SXE_MAKE_ADDER([SXEUIGTK], [libsxeuiGtk])
-
 dnl SXE_ADD_STATMOD_A(foo.o ...)
 AC_DEFUN([SXE_ADD_STATMOD_A], [
        statmod_archives="$statmod_archives [$1]" && \
@@ -146,13 +143,35 @@ AC_DEFUN([SXE_SUBST_STATMOD_A], [AC_SUBST(statmod_archives)])
 
 dnl SXE_APPEND(value, varname)
 AC_DEFUN([SXE_APPEND],
-[[$2]="$[$2] [$1]" && dnl
- if test "$extra_verbose" = "yes"; then echo "    Appending \"[$1]\" to \$[$2]"; fi])
+[SXE_CONSECUTIVE_UNDUP($2,"$[$2] [$1]")
+ if test "$extra_verbose" = "yes"; then
+       echo "    Appending \"[$1]\" to [$2]
+       (now \"$[$2]\")"
+ fi])
 
 dnl SXE_PREPEND(value, varname)
 AC_DEFUN([SXE_PREPEND],
-[[$2]="[$1] $[$2]" && dnl
- if test "$extra_verbose" = "yes"; then echo "    Prepending \"[$1]\" to \$[$2]"; fi])
+[SXE_CONSECUTIVE_UNDUP($2,"[$1] $[$2]")
+ if test "$extra_verbose" = "yes"; then
+       echo "    Prepending \"[$1]\" to [$2]
+       (now \"$[$2]\")"
+ fi])
+
+dnl SXE_APPEND(value, varname)
+AC_DEFUN([SXE_APPEND_UNDUP],
+[SXE_UNDUP($2,"$[$2] [$1]")
+ if test "$extra_verbose" = "yes"; then
+       echo "    Appending and dedupping \"[$1]\" to [$2]
+       (now \"$[$2]\")"
+ fi])
+
+dnl SXE_PREPEND(value, varname)
+AC_DEFUN([SXE_PREPEND_UNDUP],
+[SXE_UNDUP($2,"[$1] $[$2]")
+ if test "$extra_verbose" = "yes"; then
+       echo "    Prepending and dedupping \"[$1]\" to [$2]
+       (now \"$[$2]\")"
+ fi])
 
 dnl SXE_DIE(message)
 AC_DEFUN([SXE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])
@@ -216,16 +235,16 @@ AC_DEFUN([SXE_CANONICALISE_PATH], [dnl
                            -e "s|^/amd/|/net/|")
        fi
 
-dnl    if test -d "[$]tmpp"; then
-dnl            ## the easy way ...
-dnl            ## just let the filesystem implementation do the hard work
-dnl            tmpp[]=$(cd [$]tmpp[] && echo $(pwd))
-dnl    elif test -f "[$]tmpp"; then
-dnl            ## the easy way ...
-dnl            ## just let the filesystem implementation do the hard work
-dnl            tmpp[]=$(cd $(dirname [$]tmpp[]) && \
-dnl                    echo $(pwd)/$(basename [$]tmpp[]))
-dnl    else
+dnl    if test -d "[$]tmpp"; then
+dnl            ## the easy way ...
+dnl            ## just let the filesystem implementation do the hard work
+dnl            tmpp[]=$(cd [$]tmpp[] && echo $(pwd))
+dnl    elif test -f "[$]tmpp"; then
+dnl            ## the easy way ...
+dnl            ## just let the filesystem implementation do the hard work
+dnl            tmpp[]=$(cd $(dirname [$]tmpp[]) && \
+dnl                    echo $(pwd)/$(basename [$]tmpp[]))
+dnl    else
                ## simple magic
                canonicalised="no"
                while test "$canonicalised" = "no"; do
@@ -318,6 +337,15 @@ for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 $1="$T"
 ])dnl SXE_SPACE
 
+dnl SXE_CONSECUTIVE_UNDUP(var, words)
+AC_DEFUN([SXE_CONSECUTIVE_UNDUP],[
+$1=`echo "$2" | ${AWK-awk} 'BEGIN {RS=" "} {if([$]1[] != SXEL) {printf "%s ", [$]1[]} SXEL=[$]1[]}' `
+])dnl SXE_CONSECUTIVE_UNDUP
+
+dnl SXE_UNDUP(var, words)
+AC_DEFUN([SXE_UNDUP],[
+$1=`echo "$2" | ${AWK-awk} 'BEGIN {RS=" "} {VAL=[$]1[]; if(VAL in SXEL){}else{printf "%s ", VAL} SXEL[[VAL]]=1}' `
+])dnl SXE_UNDUP
 
 \f
 AC_DEFUN([SXE_LANG_WERROR], [dnl
@@ -500,8 +528,8 @@ AC_DEFUN([_SXE_MM_CHECK_pkgconfig_based], [
                SXE_DUMP_LIBS
                MM_MOD_LIBS_SITE=`$PKG_CONFIG --libs-only-L []MM_MOD[]`
                MM_MOD_HDRS_SITE=`$PKG_CONFIG --cflags-only-I []MM_MOD[]`
-               SXE_PREPEND([$MM_MOD_HDRS_SITE], [CPPFLAGS])
-               SXE_PREPEND([$MM_MOD_LIBS_SITE], [LDFLAGS])
+               SXE_PREPEND_UNDUP([$MM_MOD_HDRS_SITE], [CPPFLAGS])
+               SXE_PREPEND_UNDUP([$MM_MOD_LIBS_SITE], [LDFLAGS])
 
                MM_SUCC
                SXE_CHECK_HEADERS([]MM_MOD_HDRS[], [:], [MM_FAIL])
@@ -595,6 +623,7 @@ AC_DEFUN([_SXE_CHECK_PURE_OPT], [dnl
        --enable-largefile | --disable-largefile | \
        --enable-dependency-tracking | --disable-dependency-tracking | \
        --enable-option-checking | --disable-option-checking | \
+       --enable-silent-rules | --disable-silent-rules | \
        --with-x | --x-includes | --x-libraries | \
        --build | --host | \
        --program-prefix | --program-suffix | --program-transform-name | \