Remove iconv->giconv hack.
This commit is contained in:
parent
7e5080d2cf
commit
da7926a34c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57428
6 changed files with 0 additions and 252 deletions
|
@ -3,48 +3,6 @@ $FreeBSD$
|
|||
|
||||
--- configure.orig Thu Jan 10 12:57:53 2002
|
||||
+++ configure Thu Jan 10 12:59:14 2002
|
||||
@@ -8560,7 +8560,7 @@
|
||||
#line 8561 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -8577,12 +8577,12 @@
|
||||
rm -f conftest*
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS -liconv"
|
||||
+ LIBS="$LIBS -lgiconv"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8583 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -8620,7 +8620,7 @@
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
@@ -8658,7 +8658,7 @@
|
||||
fi
|
||||
LIBICONV=
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
- LIBICONV="-liconv"
|
||||
+ LIBICONV="-lgiconv"
|
||||
fi
|
||||
|
||||
|
||||
@@ -9608,7 +9608,7 @@
|
||||
withval="$with_help_prefix"
|
||||
GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
|
||||
|
|
|
@ -3,48 +3,6 @@ $FreeBSD$
|
|||
|
||||
--- configure.orig Thu Feb 7 15:54:38 2002
|
||||
+++ configure Thu Feb 7 16:09:08 2002
|
||||
@@ -8001,7 +8001,7 @@
|
||||
#line 8001 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -8032,12 +8032,12 @@
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS -liconv"
|
||||
+ LIBS="$LIBS -lgiconv"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 8037 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -8090,7 +8090,7 @@
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
@@ -8144,7 +8144,7 @@
|
||||
fi
|
||||
LIBICONV=
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
- LIBICONV="-liconv"
|
||||
+ LIBICONV="-lgiconv"
|
||||
fi
|
||||
|
||||
echo "$as_me:8150: checking for nl_langinfo and CODESET" >&5
|
||||
@@ -8605,7 +8605,7 @@
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
|
|
@ -3,48 +3,6 @@ $FreeBSD$
|
|||
|
||||
--- configure.orig Thu Jan 10 12:57:53 2002
|
||||
+++ configure Thu Jan 10 12:59:14 2002
|
||||
@@ -8560,7 +8560,7 @@
|
||||
#line 8561 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -8577,12 +8577,12 @@
|
||||
rm -f conftest*
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS -liconv"
|
||||
+ LIBS="$LIBS -lgiconv"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8583 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -8620,7 +8620,7 @@
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
@@ -8658,7 +8658,7 @@
|
||||
fi
|
||||
LIBICONV=
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
- LIBICONV="-liconv"
|
||||
+ LIBICONV="-lgiconv"
|
||||
fi
|
||||
|
||||
|
||||
@@ -9608,7 +9608,7 @@
|
||||
withval="$with_help_prefix"
|
||||
GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
|
||||
|
|
|
@ -3,48 +3,6 @@ $FreeBSD$
|
|||
|
||||
--- configure.orig Thu Jan 10 12:57:53 2002
|
||||
+++ configure Thu Jan 10 12:59:14 2002
|
||||
@@ -8560,7 +8560,7 @@
|
||||
#line 8561 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -8577,12 +8577,12 @@
|
||||
rm -f conftest*
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS -liconv"
|
||||
+ LIBS="$LIBS -lgiconv"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8583 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -8620,7 +8620,7 @@
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
@@ -8658,7 +8658,7 @@
|
||||
fi
|
||||
LIBICONV=
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
- LIBICONV="-liconv"
|
||||
+ LIBICONV="-lgiconv"
|
||||
fi
|
||||
|
||||
|
||||
@@ -9608,7 +9608,7 @@
|
||||
withval="$with_help_prefix"
|
||||
GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
|
||||
|
|
|
@ -3,48 +3,6 @@ $FreeBSD$
|
|||
|
||||
--- configure.orig Thu Feb 7 11:22:34 2002
|
||||
+++ configure Thu Feb 7 11:25:18 2002
|
||||
@@ -6997,7 +6997,7 @@
|
||||
#line 6998 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -7014,12 +7014,12 @@
|
||||
rm -f conftest*
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS -liconv"
|
||||
+ LIBS="$LIBS -lgiconv"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7020 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -7057,7 +7057,7 @@
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
@@ -7095,7 +7095,7 @@
|
||||
fi
|
||||
LIBICONV=
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
- LIBICONV="-liconv"
|
||||
+ LIBICONV="-lgiconv"
|
||||
fi
|
||||
|
||||
|
||||
@@ -7478,7 +7478,7 @@
|
||||
fi
|
||||
|
||||
|
|
|
@ -3,48 +3,6 @@ $FreeBSD$
|
|||
|
||||
--- configure.orig Thu Feb 7 11:22:34 2002
|
||||
+++ configure Thu Feb 7 11:25:18 2002
|
||||
@@ -6997,7 +6997,7 @@
|
||||
#line 6998 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -7014,12 +7014,12 @@
|
||||
rm -f conftest*
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS -liconv"
|
||||
+ LIBS="$LIBS -lgiconv"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7020 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
int main() {
|
||||
iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
@@ -7057,7 +7057,7 @@
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
-#include <iconv.h>
|
||||
+#include <giconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
@@ -7095,7 +7095,7 @@
|
||||
fi
|
||||
LIBICONV=
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
- LIBICONV="-liconv"
|
||||
+ LIBICONV="-lgiconv"
|
||||
fi
|
||||
|
||||
|
||||
@@ -7478,7 +7478,7 @@
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue