Commit 375ed314 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

some Make 3.79 $(strip ) versions are broken and require an empty arg,

Thu May  4 02:04:46 2000  Tim Janik  <timj@gtk.org>

        * configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
        broken and require an empty arg, give it to them.

Fri Apr 28 19:34:32 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtklabel.h: indentation fixes.
parent e097e863
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
Thu May 4 02:04:46 2000 Tim Janik <timj@gtk.org>
* configure.in (STRIP_DUMMY): some Make 3.79 $(strip ) versions are
broken and require an empty arg, give it to them.
Fri Apr 28 19:34:32 2000 Tim Janik <timj@gtk.org>
* gtk/gtklabel.h: indentation fixes.
2000-05-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_arc): Don't try to
......
......@@ -171,12 +171,14 @@ AC_MSG_CHECKING(whether make is GNU Make)
STRIP_BEGIN=
STRIP_END=
if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
STRIP_BEGIN='$(strip'
STRIP_BEGIN='$(strip $(STRIP_DUMMY)'
STRIP_END=')'
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
STRIP_DUMMY=
AC_SUBST(STRIP_DUMMY)
AC_SUBST(STRIP_BEGIN)
AC_SUBST(STRIP_END)
......@@ -254,12 +256,12 @@ if test x$with_glib = x ; then
AC_MSG_ERROR([
*** GLIB 1.3.0 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org/.]),
gmodule gthread)
gobject gmodule gthread)
# we do not want to make all gtk progs to link to thread libraries.
glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
glib_cflags=`$GLIB_CONFIG glib gobject gmodule --cflags`
glib_thread_cflags="$GLIB_CFLAGS"
glib_libs=`$GLIB_CONFIG glib gmodule --libs`
glib_libs=`$GLIB_CONFIG glib gobject gmodule --libs`
glib_thread_libs="$GLIB_LIBS"
GLIB_LIBS="$glib_libs"
GLIB_DEPLIBS="$glib_libs"
......@@ -274,10 +276,10 @@ else
fi
# For use in gtk-config
glib_cflags=`$GLIB_CONFIG --cflags gmodule`
glib_thread_cflags=`$GLIB_CONFIG --cflags gmodule gthread`
glib_libs=`$GLIB_CONFIG --libs gmodule`
glib_thread_libs=`$GLIB_CONFIG --libs gmodule gthread`
glib_cflags=`$GLIB_CONFIG --cflags gobject gmodule`
glib_thread_cflags=`$GLIB_CONFIG --cflags gobject gmodule gthread`
glib_libs=`$GLIB_CONFIG --libs gobject gmodule`
glib_thread_libs=`$GLIB_CONFIG --libs gobject gmodule gthread`
glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
......@@ -292,7 +294,7 @@ else
esac
GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la"
GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgobject.la $glib_dir/gmodule/libgmodule.la"
GLIB_DEPLIBS=
AC_SUBST(GLIB_CFLAGS)
......
......@@ -69,24 +69,23 @@ struct _GtkLabelClass
GtkMiscClass parent_class;
};
GtkType gtk_label_get_type (void);
GtkWidget *gtk_label_new (const char *str);
void gtk_label_set_text (GtkLabel *label,
const char *str);
void gtk_label_set_justify (GtkLabel *label,
GtkJustification jtype);
void gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern);
void gtk_label_set_line_wrap (GtkLabel *label,
gboolean wrap);
gchar * gtk_label_get_text (GtkLabel *label);
GtkType gtk_label_get_type (void);
GtkWidget * gtk_label_new (const char *str);
void gtk_label_set_text (GtkLabel *label,
const char *str);
void gtk_label_set_justify (GtkLabel *label,
GtkJustification jtype);
void gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern);
void gtk_label_set_line_wrap (GtkLabel *label,
gboolean wrap);
gchar * gtk_label_get_text (GtkLabel *label);
/* Convenience function to set the name and pattern by parsing
* a string with embedded underscores, and return the appropriate
* key symbol for the accelerator.
*/
guint gtk_label_parse_uline (GtkLabel *label,
guint gtk_label_parse_uline (GtkLabel *label,
const gchar *string);
#ifndef GTK_DISABLE_COMPAT_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