[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2004-12-02 16:02:30
Message-ID: 20041202160230.E77901BA44 () office ! kde ! org
[Download RAW message or body]

CVS commit by reed: 

fix shell errors when kfontinst isn't there:

configure: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/
configure: WARNING: Missing FreeType2 - disabling kfontinst!
./configure: line 43903: test: -eq: unary operator expected
./configure: line 43912: test: -eq: unary operator expected


  M +5 -5      configure.in.in   1.27


--- kdebase/kcontrol/kfontinst/configure.in.in  #1.26:1.27
@@ -30,5 +30,5 @@
 fi
 
-if test $KFI_FOUND_FREETYPE -eq 1; then
+if test "$KFI_FOUND_FREETYPE" -eq 1; then
     AC_SUBST(LIBFREETYPE_LIBS)
     AC_SUBST(LIBFREETYPE_CFLAGS)
@@ -79,5 +79,5 @@
     fi
 
-    if test $KFI_FOUND_FONTCONFIG -eq 1; then
+    if test "$KFI_FOUND_FONTCONFIG" -eq 1; then
         AC_SUBST(LIBFONTCONFIG_LIBS)
         AC_SUBST(LIBFONTCONFIG_CFLAGS)
@@ -130,5 +130,5 @@
         
         AC_CHECK_HEADER(X11/Xft/Xft.h, [ac_xft_headers=1])
-        if test $ac_xft_headers -eq 1 ; then
+        if test "$ac_xft_headers" -eq 1 ; then
             LIBXFT_LIB=-lXft
             AC_SUBST(LIBXFT_LIB)
@@ -146,7 +146,7 @@
 fi
 
-AM_CONDITIONAL(include_fontinst_tn, test $ac_xft_headers -eq 1)
+AM_CONDITIONAL(include_fontinst_tn, test "$ac_xft_headers" -eq 1)
 
-if test $ac_xft_headers -eq 1 ; then
+if test "$ac_xft_headers" -eq 1 ; then
     AC_DEFINE(HAVE_XFT, 1, [Defines if you have Xft])
 fi


[prev in list] [next in list] [prev in thread] [next in thread]