It's all in the changelog. Well, almost all.
-owt
This commit is contained in:
		
							
								
								
									
										44
									
								
								glib/configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										44
									
								
								glib/configure
									
									
									
									
										vendored
									
									
								
							| @ -1227,7 +1227,7 @@ fi | ||||
|  | ||||
|  | ||||
| if test -n "$DEBUGFLAG"; then | ||||
|   test "${CFLAGS+set}" = set || CFLAGS="$DEBUGFLAG" | ||||
|   test "$cflags_set" = set || CFLAGS="$DEBUGFLAG" | ||||
| fi | ||||
|  | ||||
| # Checks for programs. | ||||
| @ -2453,10 +2453,10 @@ fi | ||||
| # (under some other name?) then the definitions would | ||||
| # belong there. (They are only used in GDK) | ||||
|  | ||||
| # Look for wide string functions in wchar.h or wcstr.h | ||||
| # Check for wchar.h | ||||
|  | ||||
| echo $ac_n "checking for <wchar.h> or <wcstr.h>""... $ac_c" 1>&6 | ||||
| echo "configure:2460: checking for <wchar.h> or <wcstr.h>" >&5 | ||||
| echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 | ||||
| echo "configure:2460: checking for wchar.h" >&5 | ||||
| cat > conftest.$ac_ext <<EOF | ||||
| #line 2462 "configure" | ||||
| #include "confdefs.h" | ||||
| @ -2481,44 +2481,20 @@ if test $gtk_ok = yes; then | ||||
| #define HAVE_WCHAR_H 1 | ||||
| EOF | ||||
|  | ||||
| else | ||||
|    cat > conftest.$ac_ext <<EOF | ||||
| #line 2487 "configure" | ||||
| #include "confdefs.h" | ||||
| #include <wcstr.h> | ||||
| EOF | ||||
| ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||||
| { (eval echo configure:2492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||||
| ac_err=`grep -v '^ *+' conftest.out` | ||||
| if test -z "$ac_err"; then | ||||
|   rm -rf conftest* | ||||
|   gtk_ok=yes | ||||
| else | ||||
|   echo "$ac_err" >&5 | ||||
|   echo "configure: failed program was:" >&5 | ||||
|   cat conftest.$ac_ext >&5 | ||||
|   rm -rf conftest* | ||||
|   gtk_ok=no | ||||
| fi | ||||
| rm -f conftest* | ||||
|    if test $gtk_ok = yes; then | ||||
|        cat >> confdefs.h <<\EOF | ||||
| #define HAVE_WCSTR_H 1 | ||||
| EOF | ||||
|  | ||||
|    fi | ||||
| fi | ||||
| echo "$ac_t""$gtk_ok" 1>&6 | ||||
|  | ||||
| # Check for wctype.h (for iswalnum) | ||||
| echo $ac_n "checking for <wctype.h>""... $ac_c" 1>&6 | ||||
| echo "configure:2515: checking for <wctype.h>" >&5 | ||||
|  | ||||
| echo $ac_n "checking for wctype.h""... $ac_c" 1>&6 | ||||
| echo "configure:2491: checking for wctype.h" >&5 | ||||
| cat > conftest.$ac_ext <<EOF | ||||
| #line 2517 "configure" | ||||
| #line 2493 "configure" | ||||
| #include "confdefs.h" | ||||
| #include <wctype.h> | ||||
| EOF | ||||
| ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||||
| { (eval echo configure:2522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||||
| { (eval echo configure:2498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||||
| ac_err=`grep -v '^ *+' conftest.out` | ||||
| if test -z "$ac_err"; then | ||||
|   rm -rf conftest* | ||||
|  | ||||
| @ -24,7 +24,7 @@ AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]] | ||||
| 		    , enable_ansi=no) | ||||
|  | ||||
| if test -n "$DEBUGFLAG"; then | ||||
|   test "${CFLAGS+set}" = set || CFLAGS="$DEBUGFLAG" | ||||
|   test "$cflags_set" = set || CFLAGS="$DEBUGFLAG" | ||||
| fi | ||||
|  | ||||
| # Checks for programs. | ||||
| @ -116,21 +116,18 @@ fi | ||||
| # (under some other name?) then the definitions would | ||||
| # belong there. (They are only used in GDK) | ||||
|  | ||||
| # Look for wide string functions in wchar.h or wcstr.h | ||||
| # Check for wchar.h | ||||
|  | ||||
| AC_MSG_CHECKING(for <wchar.h> or <wcstr.h>) | ||||
| AC_MSG_CHECKING(for wchar.h) | ||||
| AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no) | ||||
| if test $gtk_ok = yes; then | ||||
|    AC_DEFINE(HAVE_WCHAR_H) | ||||
| else | ||||
|    AC_TRY_CPP([#include <wcstr.h>], gtk_ok=yes, gtk_ok=no) | ||||
|    if test $gtk_ok = yes; then | ||||
|        AC_DEFINE(HAVE_WCSTR_H) | ||||
|    fi | ||||
| fi | ||||
| AC_MSG_RESULT($gtk_ok) | ||||
|  | ||||
| # Check for wctype.h (for iswalnum) | ||||
| AC_MSG_CHECKING(for <wctype.h>) | ||||
|  | ||||
| AC_MSG_CHECKING(for wctype.h) | ||||
| AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no) | ||||
| if test $gtk_ok = yes; then | ||||
|    AC_DEFINE(HAVE_WCTYPE_H) | ||||
|  | ||||
| @ -31,7 +31,6 @@ | ||||
| #undef NO_SYS_SIGLIST | ||||
|  | ||||
| #undef HAVE_WCHAR_H | ||||
| #undef HAVE_WCSTR_H | ||||
| #undef HAVE_WCTYPE_H | ||||
|  | ||||
| /* #undef PACKAGE */ | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Owen Taylor
					Owen Taylor