Attachment 20436 Details for Bug 36063 – nautilus.diff

[patch] nautilus.diff

nautilus.diff (text/plain), 1.52 KB, created by Joe Marcus Clarke on 2002-03-18 23:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Marcus Clarke

Created: 2002-03-18 23:10:01 UTC

Size: 1.52 KB

patch

obsolete

>--- Makefile.orig	Mon Mar 18 17:49:47 2002
>+++ Makefile	Mon Mar 18 17:49:40 2002
>@@ -40,7 +40,7 @@
> INSTALLS_SHLIB=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
>-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \
>+		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
> 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
> 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
>                 XGETTEXT=${LOCALBASE}/bin/xgettext-new
>--- files/patch-aa.orig	Mon Mar 18 17:55:23 2002
>+++ files/patch-aa	Mon Mar 18 17:52:09 2002
>@@ -30,33 +30,6 @@
>  cat > conftest.$ac_ext <<EOF
>  #line 7063 "configure"
>  #include "confdefs.h"
>-@@ -7585,14 +7585,14 @@
>-    #
>-    # Check for libiconv
>-    #
>--   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
>--echo "configure:7590: checking for libiconv_open in -liconv" >&5
>-+   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
>-+echo "configure:7590: checking for libiconv_open in -lgiconv" >&5
>- ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
>- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   ac_save_LIBS="$LIBS"
>--LIBS="-liconv  $LIBS"
>-+LIBS="-lgiconv  $LIBS"
>- cat > conftest.$ac_ext <<EOF
>- #line 7598 "configure"
>- #include "confdefs.h"
>-@@ -7632,7 +7632,7 @@
>- fi
>- 
>- if test "x$with_libiconv" = "xyes" ; then
>--  ICONV_LIBS="-liconv"
>-+  ICONV_LIBS="-lgiconv"
>- fi
>- 
>- 	
> @@ -9141,7 +9141,7 @@
>  fi

Actions: View | Diff

Attachments on bug 36063: 20436