Commit 4b4c6aff authored by Owen Taylor's avatar Owen Taylor

Various configuration and portability related changes. See ChangeLog

for details.
                                        -owt
parent c3ac6c80
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* gdk/Makefile.am: add a dependence for $(DEP_FILES) on
$(BUILT_SOURCES) to work around automake problem
Wed Dec 3 1997 Owen Taylor <owt1@cornell.edu>
* configure.in glib/configure.in glib/glibconfig.h.in gdk/gdk.h
gdk/gdk18n.h gdk.c gtk/gtkentry.c: Try to handle variations in
<wchar.h> headers gracefully. Do not automatically include
gdk/gdki18n.h.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkoptionmenu.c: fixed a old bug where if you set a new
menu for a optionmenu the widget would not get positioned correctly
inside of the optionmenu.
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: Include unistd.h to get SEEK_END
for SunOS (john_johns@credence.com)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* gtk+/fnmatch.c: Define _GNU_SOURCE before including
fnmatch.h to make sure all constants are defined.
(Yasuhiro SHIRASAKI <joke@awa.tohoku.ac.jp>)
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* configure.in, glib/configure.in: Make the logic to add -Wall,
-ansi, -pedantic for GCC operational.
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in. Disabled gldouble, since
it wasn't used anywhere and caused portability problems
Tue Dec 1 1997 Owen Taylor <owt1@cornell.edu>
Tue Dec 2 1997 Owen Taylor <owt1@cornell.edu>
* glib/glib.h, glib/configure.in, glib/glibconfig.h.in: Added a
g_memmove function which is simply memmove if it exists, otherwise
bcopy.(Should really check if bcopy has the correct semantics, and
create our own memmove is necessary)
* glib/gstring.c, glib/garray.c, gtk/gtktext.c:
memmove => g_memmove
Sun Nov 30 1997 Jay Painter <jpaint@serv.net>
* gtk/gtknotebook.c: fixed a old bug where all the notebook pages
......
......@@ -48,19 +48,16 @@ AC_PROG_INSTALL
AC_PROG_MAKE_SET
if eval "test x$GCC = xyes"; then
test `echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null`
if test ! $?; then
if test ! `echo "$CFLAGS" | grep "\-Wall" 2> /dev/null` ; then
CFLAGS="$CFLAGS -Wall"
fi
if eval "test x$enable_ansi = xyes"; then
test `echo "$CFLAGS" | grep "\-ansi" > /dev/null 2> /dev/null`
if test ! $?; then
if test ! `echo "$CFLAGS" | grep "\-ansi" 2> /dev/null` ; then
CFLAGS="$CFLAGS -ansi"
fi
test `echo "$CFLAGS" | grep "\-pedantic" > /dev/null 2> /dev/null`
if test ! $?; then
if test ! `echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null` ; then
CFLAGS="$CFLAGS -pedantic"
fi
fi
......@@ -193,21 +190,38 @@ gtk_cv_display_resource_base="private3")])
AC_MSG_RESULT($gtk_cv_display_resource_base)
AC_DEFINE_UNQUOTED(RESOURCE_BASE, gdk_display->$gtk_cv_display_resource_base)
# Look for wide string functions in wchar.h or wcstr.h
AC_MSG_CHECKING(for <wchar.h> or <wcstr.h>)
AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
if test $gtk_ok = no; then
AC_TRY_CPP([#include <wcstr.h>], gtk_ok=yes, gtk_ok=no)
if test $gtk_ok = no; then
gtk_cv_x_locale=yes
fi
fi
AC_MSG_RESULT($gtk_ok)
# Check if X_LOCALE definition is necessary
AC_MSG_CHECKING(need -DX_LOCALE)
AC_TRY_RUN([
#include <stdio.h>
#include <locale.h>
int
main ()
{
return setlocale (LC_ALL, "${with_locale}") == NULL;
}],
gtk_cv_x_locale=no,
gtk_cv_x_locale=yes)
AC_MSG_RESULT($gtk_cv_x_locale)
if test x$gtk_cv_x_locale = xyes; then
AC_MSG_RESULT([yes (C library doesn't include wide string functions)])
else
AC_TRY_RUN([
#include <stdio.h>
#include <locale.h>
int
main ()
{
return setlocale (LC_ALL, "${with_locale}") == NULL;
}],
gtk_cv_x_locale=no,
gtk_cv_x_locale=yes)
AC_MSG_RESULT($gtk_cv_x_locale)
fi
if test $gtk_cv_x_locale = yes; then
CFLAGS="$CFLAGS -DX_LOCALE"
fi
......
......@@ -74,3 +74,5 @@ files:
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
echo $$p; \
done
$(DEP_FILES) : $(BUILT_SOURCES)
......@@ -49,7 +49,7 @@
#include "gdkx.h"
#include "gdkkeysyms.h"
#endif
#include "gdki18n.h"
#ifndef X_GETTIMEOFDAY
#define X_GETTIMEOFDAY(tv) gettimeofday (tv, NULL)
......@@ -1754,8 +1754,10 @@ gdk_event_translate (GdkEvent *event,
{
if(gdk_dnd.drag_really)
{
GdkPoint foo = {xevent->xbutton.x_root,
xevent->xbutton.y_root};
GdkPoint foo;
foo.x = xevent->xbutton.x_root;
foo.y = xevent->xbutton.y_root;
XUngrabPointer(gdk_display, CurrentTime);
if(dnd_drag_target != None)
......@@ -2522,7 +2524,7 @@ gdk_event_translate (GdkEvent *event,
{
event->other.type = GDK_OTHER_EVENT;
event->other.window = window;
event->other.xevent = &other_xevent[other_xevent_i];
event->other.xevent = (GdkXEvent *)&other_xevent[other_xevent_i];
memcpy (&other_xevent[other_xevent_i], xevent, sizeof (XEvent));
other_xevent_i = (other_xevent_i+1) % OTHER_XEVENT_BUFSIZE;
return_val = TRUE;
......
......@@ -20,7 +20,6 @@
#include <gdk/gdktypes.h>
#include <gdk/gdki18n.h>
#ifdef __cplusplus
......
......@@ -19,13 +19,32 @@
#ifndef __GDK_I18N_H__
#define __GDK_I18N_H__
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
/* international string support */
#include <stdlib.h>
#include <wchar.h>
#ifdef X_LOCALE
#ifdef HAVE_WCTYPE_H
#include <wctype.h>
#else
#define iswalnum isalnum
/* Other functions could be added here if necessary */
#endif /* HAVE_WCTYPE_H */
#ifndef X_LOCALE
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#else /* !HAVE_WCHAR_H */
#ifdef HAVE_WCSTR_H
#include <wcstr.h>
#endif /* HAVE_WCSTR_H*/
#endif /* HAVE_WCHAR_H */
#else /* X_LOCALE */
#include <X11/Xfuncproto.h>
#include <X11/Xosdefs.h>
......@@ -38,6 +57,7 @@ extern int _Xmblen (
#if NeedFunctionPrototypes
const char *s, size_t n
#endif
);
_XFUNCPROTOEND
......@@ -133,7 +153,7 @@ extern int _g_mbtowc (wchar_t *wstr, const char *str, size_t len);
#define wcstombs(a,b,c) _Xwcstombs ((a),(b),(c))
#define wcslen(a) _Xwcslen ((a))
#define wcscpy(a,b) _Xwcscpy ((a),(b))
#define wcsncpy(a,b,c) _Xwcsnpy ((a),(b),(c))
#define wcsncpy(a,b,c) _Xwcsncpy ((a),(b),(c))
#ifdef __cplusplus
}
......@@ -141,4 +161,4 @@ extern int _g_mbtowc (wchar_t *wstr, const char *str, size_t len);
#endif /* X_LOCALE */
#endif __GDK_I18N_H__
#endif /* __GDK_I18N_H__ */
......@@ -19,8 +19,6 @@
#define __GDK_TYPES_H__
#include <wchar.h>
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
......@@ -960,15 +958,13 @@ struct _GdkEventClient
} data;
};
#ifndef _XLIB_H_
#define XEvent void
#endif
typedef void GdkXEvent; /* Can be cast to XEvent */
struct _GdkEventOther
{
GdkEventType type;
GdkWindow *window;
XEvent *xevent;
GdkXEvent *xevent;
};
union _GdkEvent
......
......@@ -49,7 +49,7 @@
#include "gdkx.h"
#include "gdkkeysyms.h"
#endif
#include "gdki18n.h"
#ifndef X_GETTIMEOFDAY
#define X_GETTIMEOFDAY(tv) gettimeofday (tv, NULL)
......@@ -1754,8 +1754,10 @@ gdk_event_translate (GdkEvent *event,
{
if(gdk_dnd.drag_really)
{
GdkPoint foo = {xevent->xbutton.x_root,
xevent->xbutton.y_root};
GdkPoint foo;
foo.x = xevent->xbutton.x_root;
foo.y = xevent->xbutton.y_root;
XUngrabPointer(gdk_display, CurrentTime);
if(dnd_drag_target != None)
......@@ -2522,7 +2524,7 @@ gdk_event_translate (GdkEvent *event,
{
event->other.type = GDK_OTHER_EVENT;
event->other.window = window;
event->other.xevent = &other_xevent[other_xevent_i];
event->other.xevent = (GdkXEvent *)&other_xevent[other_xevent_i];
memcpy (&other_xevent[other_xevent_i], xevent, sizeof (XEvent));
other_xevent_i = (other_xevent_i+1) % OTHER_XEVENT_BUFSIZE;
return_val = TRUE;
......
......@@ -33,19 +33,16 @@ AM_PROG_CC_STDC
AC_PROG_INSTALL
if eval "test x$GCC = xyes"; then
test `echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null`
if test ! $?; then
if test ! `echo "$CFLAGS" | grep "\-Wall" 2> /dev/null` ; then
CFLAGS="$CFLAGS -Wall"
fi
if eval "test x$enable_ansi = xyes"; then
test `echo "$CFLAGS" | grep "\-ansi" > /dev/null 2> /dev/null`
if test ! $?; then
if test ! `echo "$CFLAGS" | grep "\-ansi" 2> /dev/null` ; then
CFLAGS="$CFLAGS -ansi"
fi
test `echo "$CFLAGS" | grep "\-pedantic" > /dev/null 2> /dev/null`
if test ! $?; then
if test ! `echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null` ; then
CFLAGS="$CFLAGS -pedantic"
fi
fi
......@@ -114,4 +111,30 @@ if test $gtk_ok = no; then
AC_DEFINE(NO_FD_SET)
fi
# This stuff is here, only so that we can define these
# things in glibconfig.h. If ../config.h was installed
# (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
AC_MSG_CHECKING(for <wchar.h> or <wcstr.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
# Check for wctype.h (for iswalnum)
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)
fi
AC_MSG_RESULT($gtk_ok)
AC_OUTPUT(Makefile)
......@@ -67,3 +67,13 @@
/* Define if you have the <values.h> header file. */
#undef HAVE_VALUES_H
/* Define if you have the <wchar.h> header file */
#undef HAVE_WCHAR_H
/* Define if you have the <wcstr.h> header file */
#undef HAVE_WCSTR_H
/* Define if you have the <wctype.h> header file */
#undef HAVE_WCTYPE_H
......@@ -21,6 +21,7 @@
#include "gdk/gdkx.h"
#endif
#include "gdk/gdkkeysyms.h"
#include "gdk/gdki18n.h"
#include "gtkentry.h"
#include "gtkmain.h"
#include "gtkselection.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment