Attachment #295527 for bug #354295




++ configure

fi


                        { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6

         ENABLE_NLS="1"

else
  { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-liconv  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */

/* Override any GCC internal prototype to avoid an error.
   Use char because int might match the return type of a GCC
   builtin and then its argument prototype would still apply.  */
#ifdef __cplusplus
extern "C"
#endif
char libiconv_open ();
int
main ()
{
return libiconv_open ();
  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  (eval "$ac_link") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
	 test -z "$ac_c_werror_flag" ||
	 test ! -s conftest.err
       } && test -s conftest$ac_exeext &&
       $as_test_x conftest$ac_exeext; then
  ac_cv_lib_iconv_libiconv_open=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

	ac_cv_lib_iconv_libiconv_open=no
fi

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
if test $ac_cv_lib_iconv_libiconv_open = yes; then
  LIBS="$LIBS -liconv"

cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBICONV 1
_ACEOF


cat >>confdefs.h <<\_ACEOF
#define PR_USE_NLS 1
_ACEOF

           ENABLE_NLS="1"

else
  { echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; }
if test "${ac_cv_lib_c_iconv_open+set}" = set; then

#define PR_USE_NLS 1
_ACEOF

             ENABLE_NLS="1"

else
  { { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5


fi


fi


fi

++ configure.in

      )

      dnl Similarly, the libiconv library is only needed on some non-GNU
      dnl systems.  Note that some systems redefine the iconv_open function
      dnl to something else (Bug#3682), e.g. libiconv_open.
      AC_CHECK_LIB(iconv, iconv_open,
        [LIBS="$LIBS -liconv"
         AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
         AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
         ENABLE_NLS="1"
        ],
        [AC_CHECK_LIB(iconv, libiconv_open,
          [LIBS="$LIBS -liconv"
           AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
           AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
           ENABLE_NLS="1"
          ],
          [AC_CHECK_LIB(c, iconv_open,
            [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
             ENABLE_NLS="1"
            ],
            [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
          ])
        ])
      )
    fi

Return to bug 354295

Line Link Here

(-)file_not_specified_in_diff (-8 / +95 lines)
0	-- configure	0	++ configure
Lines 15457-15463 Link Here
15457	fi	15457	fi
15458		15458
15459		15459
15460	{ echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5	15460	{ echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
15461	echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }	15461	echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
15462	if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then	15462	if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
15463	echo $ECHO_N "(cached) $ECHO_C" >&6	15463	echo $ECHO_N "(cached) $ECHO_C" >&6
Lines 15533-15538 Link Here
15533	ENABLE_NLS="1"	15533	ENABLE_NLS="1"
15534		15534
15535	else	15535	else
		15536	{ echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
		15537	echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
		15538	if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
		15539	echo $ECHO_N "(cached) $ECHO_C" >&6
		15540	else
		15541	ac_check_lib_save_LIBS=$LIBS
		15542	LIBS="-liconv $LIBS"
		15543	cat >conftest.$ac_ext <<_ACEOF
		15544	/* confdefs.h. */
		15545	_ACEOF
		15546	cat confdefs.h >>conftest.$ac_ext
		15547	cat >>conftest.$ac_ext <<_ACEOF
		15548	/* end confdefs.h. */
		15549
		15550	/* Override any GCC internal prototype to avoid an error.
		15551	Use char because int might match the return type of a GCC
		15552	builtin and then its argument prototype would still apply. */
		15553	#ifdef __cplusplus
		15554	extern "C"
		15555	#endif
		15556	char libiconv_open ();
		15557	int
		15558	main ()
		15559	{
		15560	return libiconv_open ();
		15561	;
		15562	return 0;
		15563	}
		15564	_ACEOF
		15565	rm -f conftest.$ac_objext conftest$ac_exeext
		15566	if { (ac_try="$ac_link"
		15567	case "(($ac_try" in
		15568	\" \| \` \| \\) ac_try_echo=\$ac_try;;
		15569	*) ac_try_echo=$ac_try;;
		15570	esac
		15571	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
		15572	(eval "$ac_link") 2>conftest.er1
		15573	ac_status=$?
		15574	grep -v '^ *+' conftest.er1 >conftest.err
		15575	rm -f conftest.er1
		15576	cat conftest.err >&5
		15577	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		15578	(exit $ac_status); } && {
		15579	test -z "$ac_c_werror_flag" \|\|
		15580	test ! -s conftest.err
		15581	} && test -s conftest$ac_exeext &&
		15582	$as_test_x conftest$ac_exeext; then
		15583	ac_cv_lib_iconv_libiconv_open=yes
		15584	else
		15585	echo "$as_me: failed program was:" >&5
		15586	sed 's/^/\| /' conftest.$ac_ext >&5
		15587
		15588	ac_cv_lib_iconv_libiconv_open=no
		15589	fi
		15590
		15591	rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
		15592	conftest$ac_exeext conftest.$ac_ext
		15593	LIBS=$ac_check_lib_save_LIBS
		15594	fi
		15595	{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
		15596	echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
		15597	if test $ac_cv_lib_iconv_libiconv_open = yes; then
		15598	LIBS="$LIBS -liconv"
		15599
15600	cat >>confdefs.h <<\_ACEOF
15601	#define HAVE_LIBICONV 1
15602	_ACEOF
15603
15604
15605	cat >>confdefs.h <<\_ACEOF
15606	#define PR_USE_NLS 1
15607	_ACEOF
15608
15609	ENABLE_NLS="1"
15610
15611	else
15536	{ echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5	15612	{ echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
15537	echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; }	15613	echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; }
15538	if test "${ac_cv_lib_c_iconv_open+set}" = set; then	15614	if test "${ac_cv_lib_c_iconv_open+set}" = set; then
Lines 15600-15606 Link Here
15600	#define PR_USE_NLS 1	15676	#define PR_USE_NLS 1
15601	_ACEOF	15677	_ACEOF
15602		15678
15603	ENABLE_NLS="1"	15679	ENABLE_NLS="1"
15604		15680
15605	else	15681	else
15606	{ { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5	15682	{ { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5
Lines 15609-15614 Link Here
15609		15685
15610	fi	15686	fi
15611		15687
		15688
		15689	fi
		15690
15612		15691
15613	fi	15692	fi
15614		15693
15615	-- configure.in	15694	++ configure.in
Lines 715-732 Link Here
715	)	715	)
716		716
717	dnl Similarly, the libiconv library is only needed on some non-GNU	717	dnl Similarly, the libiconv library is only needed on some non-GNU
718	dnl systems.	718	dnl systems. Note that some systems redefine the iconv_open function
		719	dnl to something else (Bug#3682), e.g. libiconv_open.
719	AC_CHECK_LIB(iconv, iconv_open,	720	AC_CHECK_LIB(iconv, iconv_open,
720	[LIBS="$LIBS -liconv"	721	[LIBS="$LIBS -liconv"
721	AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])	722	AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
722	AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])	723	AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
723	ENABLE_NLS="1"	724	ENABLE_NLS="1"
724	],	725	],
725	[AC_CHECK_LIB(c, iconv_open,	726	[AC_CHECK_LIB(iconv, libiconv_open,
726	[AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])	727	[LIBS="$LIBS -liconv"
		728	AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
		729	AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
727	ENABLE_NLS="1"	730	ENABLE_NLS="1"
728	],	731	],
729	[AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]	732	[AC_CHECK_LIB(c, iconv_open,
		733	[AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
		734	ENABLE_NLS="1"
		735	],
		736	[AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
		737	])
730	])	738	])
731	)	739	)
732	fi	740	fi