View | Details | Raw Unified | Return to bug 36063
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 40-46 Link Here
40 
INSTALLS_SHLIB=	yes
 40 
INSTALLS_SHLIB=	yes
41 
GNU_CONFIGURE=	yes
 41 
GNU_CONFIGURE=	yes
42 
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 42 
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
43 
		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \
 43 
		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
44 
		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
 44 
		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
45 
		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
 45 
		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
46 
                XGETTEXT=${LOCALBASE}/bin/xgettext-new
 46 
                XGETTEXT=${LOCALBASE}/bin/xgettext-new
(-)files/patch-aa (-27 lines)
Lines 30-62 Link Here
30 
 cat > conftest.$ac_ext <<EOF
 30 
 cat > conftest.$ac_ext <<EOF
31 
 #line 7063 "configure"
 31 
 #line 7063 "configure"
32 
 #include "confdefs.h"
 32 
 #include "confdefs.h"
33 
@@ -7585,14 +7585,14 @@
34 
    #
35 
    # Check for libiconv
36 
    #
37 
-   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
38 
-echo "configure:7590: checking for libiconv_open in -liconv" >&5
39 
+   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
40 
+echo "configure:7590: checking for libiconv_open in -lgiconv" >&5
41 
 ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
42 
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43 
   echo $ac_n "(cached) $ac_c" 1>&6
44 
 else
45 
   ac_save_LIBS="$LIBS"
46 
-LIBS="-liconv  $LIBS"
47 
+LIBS="-lgiconv  $LIBS"
48 
 cat > conftest.$ac_ext <<EOF
49 
 #line 7598 "configure"
50 
 #include "confdefs.h"
51 
@@ -7632,7 +7632,7 @@
52 
 fi
53
54 
 if test "x$with_libiconv" = "xyes" ; then
55 
-  ICONV_LIBS="-liconv"
56 
+  ICONV_LIBS="-lgiconv"
57 
 fi
58
59
60 
@@ -9141,7 +9141,7 @@
 33 
@@ -9141,7 +9141,7 @@
61 
 fi
 34 
 fi

Return to bug 36063