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

(-)files/patch-ae (-93 / +2 lines)
Lines 1-8 Link Here
1
1
--- configure.orig	Sun Mar 24 17:10:35 2002
2
$FreeBSD: ports/devel/glib20/files/patch-ae,v 1.22 2002/03/11 19:08:04 sobomax Exp $
2
+++ configure	Sun Mar 24 17:11:45 2002
3
4
--- configure.orig	Fri Mar  8 17:54:21 2002
5
+++ configure	Mon Mar 11 10:21:32 2002
6
@@ -16768,8 +16768,8 @@
3
@@ -16768,8 +16768,8 @@
7
 rm -f conftest.$ac_objext conftest.$ac_ext
4
 rm -f conftest.$ac_objext conftest.$ac_ext
8
 		fi
5
 		fi
Lines 23-113 Link Here
23
 		;;
20
 		;;
24
              *)
21
              *)
25
 		for thread_lib in "" pthread pthread32 pthreads thread dce; do
22
 		for thread_lib in "" pthread pthread32 pthreads thread dce; do
26
@@ -18048,13 +18048,13 @@
27
 
28
     # Check if we have GNU libiconv
29
     if test $found_iconv = "no"; then
30
-      echo "$as_me:18051: checking for libiconv_open in -liconv" >&5
31
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
32
+      echo "$as_me:18051: checking for libiconv_open in -lgiconv" >&5
33
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
34
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
35
   echo $ECHO_N "(cached) $ECHO_C" >&6
36
 else
37
   ac_check_lib_save_LIBS=$LIBS
38
-LIBS="-liconv  $LIBS"
39
+LIBS="-lgiconv  $LIBS"
40
 cat >conftest.$ac_ext <<_ACEOF
41
 #line 18059 "configure"
42
 #include "confdefs.h"
43
@@ -18108,15 +18108,15 @@
44
 fi
45
 
46
     fi
47
-    # Check if we have a iconv in -liconv, possibly from vendor
48
+    # Check if we have a iconv in -lgiconv, possibly from vendor
49
     if test $found_iconv = "no"; then
50
-      echo "$as_me:18113: checking for iconv_open in -liconv" >&5
51
-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
52
+      echo "$as_me:18113: checking for iconv_open in -lgiconv" >&5
53
+echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
54
 if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
55
   echo $ECHO_N "(cached) $ECHO_C" >&6
56
 else
57
   ac_check_lib_save_LIBS=$LIBS
58
-LIBS="-liconv  $LIBS"
59
+LIBS="-lgiconv  $LIBS"
60
 cat >conftest.$ac_ext <<_ACEOF
61
 #line 18121 "configure"
62
 #include "confdefs.h"
63
@@ -18242,13 +18242,13 @@
64
 
65
     ;;
66
   gnu|yes)
67
-    echo "$as_me:18245: checking for libiconv_open in -liconv" >&5
68
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
69
+    echo "$as_me:18245: checking for libiconv_open in -lgiconv" >&5
70
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
71
 if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
72
   echo $ECHO_N "(cached) $ECHO_C" >&6
73
 else
74
   ac_check_lib_save_LIBS=$LIBS
75
-LIBS="-liconv  $LIBS"
76
+LIBS="-lgiconv  $LIBS"
77
 cat >conftest.$ac_ext <<_ACEOF
78
 #line 18253 "configure"
79
 #include "confdefs.h"
80
@@ -18303,13 +18303,13 @@
81
 
82
     ;;
83
   native)
84
-    echo "$as_me:18306: checking for iconv_open in -liconv" >&5
85
-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
86
+    echo "$as_me:18306: checking for iconv_open in -lgiconv" >&5
87
+echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
88
 if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
89
   echo $ECHO_N "(cached) $ECHO_C" >&6
90
 else
91
   ac_check_lib_save_LIBS=$LIBS
92
-LIBS="-liconv  $LIBS"
93
+LIBS="-lgiconv  $LIBS"
94
 cat >conftest.$ac_ext <<_ACEOF
95
 #line 18314 "configure"
96
 #include "confdefs.h"
97
@@ -18373,14 +18373,14 @@
98
 
99
 case $with_libiconv in
100
   gnu)
101
-    ICONV_LIBS="-liconv"
102
+    ICONV_LIBS="-lgiconv"
103
     cat >>confdefs.h <<\_ACEOF
104
 #define USE_LIBICONV_GNU Using GNU libiconv
105
 _ACEOF
106
 
107
     ;;
108
   native)
109
-    ICONV_LIBS="-liconv"
110
+    ICONV_LIBS="-lgiconv"
111
     cat >>confdefs.h <<\_ACEOF
112
 #define USE_LIBICONV_NATIVE Using a native implementation of iconv in a separate library
113
 _ACEOF

Return to bug 36265