diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2008-03-10 07:49:48 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2008-03-10 07:49:48 +0000 |
| commit | 045ebffad708384e739218e56c3807e0c39ffcb0 (patch) | |
| tree | b0dcea1109f0e9cab3b843fcad84ac3fcf444f31 | |
| parent | 1c68e68fec95959f3a064f5bb347e2cd296f5109 (diff) | |
| download | emacs-old-branches/unicode-xft.tar.gz | |
*** empty log message ***old-branches/unicode-xft
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index c90a2f73b1a..87e7bbeca3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-03-10 Jan Dj$(Q)Z(Brv <jan.h.d@swipnet.se> + + * configure.in: Add "this branch is obsolete" error message + 2007-06-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Complain if X seems to be installed but no diff --git a/configure b/configure index f35195e762b..b875c8955a4 100755 --- a/configure +++ b/configure @@ -1798,6 +1798,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers src/config.h:src/config.in" +cat 1>&2 <<EOF +****************************************************************** +* * +* This branch is obsolete, please use the CVS trunk instead. * +* All Xft features are present in the CVS trunk. * +* * +* To switch a CVS checkout to the trunk, use the command: * +* * +* cvs update -A * +* * +****************************************************************** +EOF +exit 1 test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -12683,13 +12696,13 @@ echo "${ECHO_T}yes" >&6; } { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; } - XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"` + XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'` { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 echo "${ECHO_T}$XFT_CFLAGS" >&6; } { echo "$as_me:$LINENO: checking XFT_LIBS" >&5 echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; } - XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"` + XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'` { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 echo "${ECHO_T}$XFT_LIBS" >&6; } else |