rev 3629 - trunk/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-21 00:18:03 +0000 (Fri, 21 Apr 2006)
New Revision: 3629

Modified:
   trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
No longer look for libfonten_pic - need to update buildprep as well.


Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-04-20 21:57:05 UTC (rev 3628)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-04-21 00:18:03 UTC (rev 3629)
@@ -17182,24 +17182,6 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44578,13 +43969,13 @@
- 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
- 	;;
-      esac
--     echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5
--echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6
--if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
-+     echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc_pic" >&5
-+echo $ECHO_N "checking for FontEncDirectory in -lfontenc_pic... $ECHO_C" >&6
-+if test "${ac_cv_lib_fontenc_pic_FontEncDirectory+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfontenc  $LIBS"
-+LIBS="-lfontenc_pic  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
 @@ -44616,8 +44007,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -17210,41 +17192,6 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44629,20 +44019,20 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_fontenc_FontEncDirectory=yes
-+  ac_cv_lib_fontenc_pic_FontEncDirectory=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_fontenc_FontEncDirectory=no
-+ac_cv_lib_fontenc_pic_FontEncDirectory=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5
--echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6
--if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_pic_FontEncDirectory" >&5
-+echo "${ECHO_T}$ac_cv_lib_fontenc_pic_FontEncDirectory" >&6
-+if test $ac_cv_lib_fontenc_pic_FontEncDirectory = yes; then
-   ac_font_enc_lib=1
- else
-   ac_font_enc_lib=0
-@@ -44652,7 +44042,7 @@
-      LIBS="$kde_save_LIBS"
- 
-             if test "$ac_font_enc_lib" = "1"; then
--                LIB_FONT_ENC="-lfontenc"
-+                LIB_FONT_ENC="-lfontenc_pic"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_FONT_ENC 1
 @@ -44703,8 +44093,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -18323,18 +18270,6 @@
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -618,9 +620,9 @@
-             ld_shared_flag=
-             KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
-             LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
--            KDE_CHECK_LIB(fontenc,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
-+            KDE_CHECK_LIB(fontenc_pic,FontEncDirectory,ac_font_enc_lib=1,ac_font_enc_lib=0)
-             if test "$ac_font_enc_lib" = "1"; then
--                LIB_FONT_ENC="-lfontenc"
-+                LIB_FONT_ENC="-lfontenc_pic"
-                 AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
-             fi
-             LDFLAGS="$ac_LDFLAGS_save"
 --- doc/faq/Makefile.in
 +++ doc/faq/Makefile.in
 @@ -251,6 +251,9 @@