diff --git a/ChangeLog b/ChangeLog index 608c75fc5..785f79a04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-09-14 Adam Fedor + + * configure.in: Remove redundancies in iconv checking. Remove + redundant AC_SUBST(LIBS) lines. + 2001-09-12 Adam Fedor * Source/thr-pthread.m (objc_yield): Replace pthread_yield with diff --git a/Headers/gnustep/base/config.h.in b/Headers/gnustep/base/config.h.in index a57fccca3..2c7c09b66 100644 --- a/Headers/gnustep/base/config.h.in +++ b/Headers/gnustep/base/config.h.in @@ -61,6 +61,9 @@ /* Define if nested functions are broken on this compiler */ #undef BROKEN_NESTED_FUNCTIONS +/* Define if you have this header */ +#undef HAVE_GICONV_H + /* The number of bytes in a double. */ #undef SIZEOF_DOUBLE diff --git a/acconfig.h b/acconfig.h index fc692e934..6621642e3 100644 --- a/acconfig.h +++ b/acconfig.h @@ -46,3 +46,9 @@ /* Define if nested functions are broken on this compiler */ #undef BROKEN_NESTED_FUNCTIONS +/* Define if you have this header */ +#undef HAVE_GICONV_H + +/* Define if you have this function */ +#undef HAVE_ICONV + diff --git a/configure b/configure index c7078094b..26cb472b3 100755 --- a/configure +++ b/configure @@ -5160,7 +5160,6 @@ fi if test "$ssl_ok" = yes; then LIBS="$base_libs -lssl -lcrypto" - cat >> confdefs.h <<\EOF #define HAVE_OPENSSL 1 EOF @@ -5211,17 +5210,17 @@ for ac_hdr in gmp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5215: checking for $ac_hdr" >&5 +echo "configure:5214: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5249,7 +5248,7 @@ done if test $ac_cv_header_gmp_h = yes; then echo $ac_n "checking for mpf_abs in -lgmp""... $ac_c" 1>&6 -echo "configure:5253: checking for mpf_abs in -lgmp" >&5 +echo "configure:5252: checking for mpf_abs in -lgmp" >&5 ac_lib_var=`echo gmp'_'mpf_abs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5257,7 +5256,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5291,7 +5290,7 @@ fi if test "$gmp_ok" = no; then echo $ac_n "checking for __gmpf_abs in -lgmp""... $ac_c" 1>&6 -echo "configure:5295: checking for __gmpf_abs in -lgmp" >&5 +echo "configure:5294: checking for __gmpf_abs in -lgmp" >&5 ac_lib_var=`echo gmp'_'__gmpf_abs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5299,7 +5298,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5335,7 +5334,6 @@ fi if test "$gmp_ok" = yes; then base_libs="$LIBS" LIBS="$LIBS -lgmp" - HAVE_GMP=1 fi fi @@ -5353,12 +5351,12 @@ fi for ac_func in iconv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5357: checking for $ac_func" >&5 +echo "configure:5355: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5415,15 +5413,15 @@ else libiconv_libdir="no" fi - libs_temp=$LIBS + cppflags_temp=$CPPFLAGS if test "$libiconv_libdir" != "no"; then - LIBS="$LIBS -L$libiconv_libdir" + CPPFLAGS="$CPPFLAGS -L$libiconv_libdir" fi # BSDs install this lib as libgiconv echo $ac_n "checking for main in -lgiconv""... $ac_c" 1>&6 -echo "configure:5427: checking for main in -lgiconv" >&5 +echo "configure:5425: checking for main in -lgiconv" >&5 ac_lib_var=`echo giconv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5431,14 +5429,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgiconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5466,12 +5464,17 @@ else fi if test x"$av_cv_lib_giconv_main" = xyes; then - LIBS="$LIBS -lgiconv" - - SYSTEM_DEFS="-DHAVE_ICONV -DHAVE_GICONV_H $SYSTEM_DEFS" + cat >> confdefs.h <<\EOF +#define HAVE_ICONV_H 1 +EOF + + cat >> confdefs.h <<\EOF +#define HAVE_GICONV_H 1 +EOF + else echo $ac_n "checking for main in -liconv""... $ac_c" 1>&6 -echo "configure:5475: checking for main in -liconv" >&5 +echo "configure:5478: checking for main in -liconv" >&5 ac_lib_var=`echo iconv'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5479,14 +5482,14 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5514,21 +5517,17 @@ else fi if test x"$av_cv_lib_iconv_main" = xyes; then - LIBS="$LIBS -liconv" - - SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS" - else - LIBS="$libs_temp" + cat >> confdefs.h <<\EOF +#define HAVE_ICONV_H 1 +EOF + fi fi -else - SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS" + CPPFLAGS=$cppflag_temp fi - - subdirs="Source/mframe" @@ -5536,7 +5535,7 @@ subdirs="Source/mframe" # Record the version #-------------------------------------------------------------------- echo $ac_n "checking for the version of gnustep-base we are compiling""... $ac_c" 1>&6 -echo "configure:5540: checking for the version of gnustep-base we are compiling" >&5 +echo "configure:5539: checking for the version of gnustep-base we are compiling" >&5 if test -f "Version"; then . ./Version fi @@ -5744,8 +5743,6 @@ s%@XML_LIBS@%$XML_LIBS%g s%@HAVE_LIBXML@%$HAVE_LIBXML%g s%@HAVE_GMP@%$HAVE_GMP%g s%@SYSTEM_DEFS@%$SYSTEM_DEFS%g -s%@whole_archive@%$whole_archive%g -s%@no_whole_archive@%$no_whole_archive%g s%@subdirs@%$subdirs%g s%@VERSION@%$VERSION%g s%@MAJOR_VERSION@%$MAJOR_VERSION%g diff --git a/configure.in b/configure.in index e504abc71..7e1326ea4 100644 --- a/configure.in +++ b/configure.in @@ -846,7 +846,6 @@ if test $enable_openssl = yes; then AC_CHECK_LIB(ssl, ssl2_clear, ssl_ok=yes, ssl_ok=no) if test "$ssl_ok" = yes; then LIBS="$base_libs -lssl -lcrypto" - AC_SUBST(LIBS) AC_DEFINE(HAVE_OPENSSL) fi fi @@ -889,7 +888,6 @@ if test $ac_cv_header_gmp_h = yes; then if test "$gmp_ok" = yes; then base_libs="$LIBS" LIBS="$LIBS -lgmp" - AC_SUBST(LIBS) HAVE_GMP=1 fi fi @@ -910,35 +908,27 @@ if test $ac_cv_func_iconv = no; then AC_ARG_WITH(libiconv-library, [ --with-libiconv-library=PATH library path for libiconv libraries], libiconv_libdir="$withval", libiconv_libdir="no") - libs_temp=$LIBS + cppflags_temp=$CPPFLAGS if test "$libiconv_libdir" != "no"; then - LIBS="$LIBS -L$libiconv_libdir" + CPPFLAGS="$CPPFLAGS -L$libiconv_libdir" fi # BSDs install this lib as libgiconv AC_CHECK_LIB(giconv, main) if test x"$av_cv_lib_giconv_main" = xyes; then - LIBS="$LIBS -lgiconv" - AC_SUBST(LIBS) - SYSTEM_DEFS="-DHAVE_ICONV -DHAVE_GICONV_H $SYSTEM_DEFS" + AC_DEFINE(HAVE_ICONV) + AC_DEFINE(HAVE_GICONV_H) else AC_CHECK_LIB(iconv, main) if test x"$av_cv_lib_iconv_main" = xyes; then - LIBS="$LIBS -liconv" - AC_SUBST(LIBS) - SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS" - else - LIBS="$libs_temp" + AC_DEFINE(HAVE_ICONV) fi fi -else - SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS" + CPPFLAGS=$cppflag_temp fi AC_SUBST(SYSTEM_DEFS) -AC_SUBST(whole_archive) -AC_SUBST(no_whole_archive) AC_CONFIG_SUBDIRS(Source/mframe)