From e33741aed6ba496d959eb81de177717167349500 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 8 Sep 1998 04:08:17 +0000 Subject: use g_atexit() instead of ATEXIT. Tue Sep 8 05:19:51 1998 Tim Janik * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of ATEXIT. * ltconfig: use GLib's ltconfig which honours lcc. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ autogen.sh | 25 ++++++++++++++++++------- gdk/gdk.c | 3 +-- gdk/x11/gdkmain-x11.c | 3 +-- gtk/gtkmain.c | 3 +-- gtk/gtkobject.c | 3 +-- ltconfig | 16 ++++++++++++++++ 13 files changed, 115 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index edd5fecd7..4011d028f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index edd5fecd7..4011d028f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index edd5fecd7..4011d028f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index edd5fecd7..4011d028f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index edd5fecd7..4011d028f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index edd5fecd7..4011d028f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index edd5fecd7..4011d028f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Tue Sep 8 05:19:51 1998 Tim Janik + + * gdk/gdk.c (gdk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkmain.c (gtk_init): use g_atexit() instead of ATEXIT. + + * gtk/gtkobject.c (gtk_object_init_type): use g_atexit() instead of + ATEXIT. + + * ltconfig: use GLib's ltconfig which honours lcc. + Mon Sep 7 20:09:23 PDT 1998 Manish Singh * configure.in: comment the -std1 check and save LIBS properly diff --git a/autogen.sh b/autogen.sh index f4a29b18c..2f48d79b4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,11 +1,15 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +PROJECT=Gtk+ +TEST_TYPE=-d +FILE=gdk + DIE=0 (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have autoconf installed to compile GTK+." + echo "You must have autoconf installed to compile $PROJECT." echo "Download the appropriate package for your distribution," echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" DIE=1 @@ -13,7 +17,7 @@ DIE=0 (libtool --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have libtool installed to compile GTK+." + echo "You must have libtool installed to compile $PROJECT." echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz" echo "(or a newer version if it is available)" DIE=1 @@ -21,7 +25,7 @@ DIE=0 (automake --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have automake installed to compile GTK+." + echo "You must have automake installed to compile $PROJECT." echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" echo "(or a newer version if it is available)" DIE=1 @@ -31,8 +35,8 @@ if test "$DIE" -eq 1; then exit 1 fi -test -d gtk || { - echo "You must run this script in the top-level GTK+ directory" +test $TEST_TYPE $FILE || { + echo "You must run this script in the top-level $PROJECT directory" exit 1 } @@ -41,10 +45,17 @@ if test -z "$*"; then echo "to pass any to it, please specify them on the $0 command line." fi +case $CC in +*lcc | *lcc\ *) am_opt=--include-deps;; +esac + aclocal $ACLOCAL_FLAGS -automake +automake $am_opt autoconf +# optionally feature autoheader +(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader + ./configure "$@" echo -echo "Now type 'make' to compile GTK+." +echo "Now type 'make' to compile $PROJECT." diff --git a/gdk/gdk.c b/gdk/gdk.c index 5494657e7..867dadef6 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -571,8 +571,7 @@ gdk_init (int *argc, button_number[0] = -1; button_number[1] = -1; - if (ATEXIT (gdk_exit_func)) - g_warning ("unable to register exit function"); + g_atexit (gdk_exit_func); gdk_visual_init (); gdk_window_init (); diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 5494657e7..867dadef6 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -571,8 +571,7 @@ gdk_init (int *argc, button_number[0] = -1; button_number[1] = -1; - if (ATEXIT (gdk_exit_func)) - g_warning ("unable to register exit function"); + g_atexit (gdk_exit_func); gdk_visual_init (); gdk_window_init (); diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 28ecb3410..d40e0d97f 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -452,8 +452,7 @@ gtk_init (int *argc, /* Register an exit function to make sure we are able to cleanup. */ - if (ATEXIT (gtk_exit_func)) - g_warning ("unable to register exit function"); + g_atexit (gtk_exit_func); /* Set the 'initialized' flag. */ diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 9a8014e4e..ed41b1012 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -19,7 +19,6 @@ #include #include #include -#include #include "gtkobject.h" #include "gtksignal.h" @@ -138,7 +137,7 @@ gtk_object_init_type (void) #ifdef G_ENABLE_DEBUG if (gtk_debug_flags & GTK_DEBUG_OBJECTS) - ATEXIT (gtk_object_debug); + g_atexit (gtk_object_debug); #endif /* G_ENABLE_DEBUG */ } diff --git a/ltconfig b/ltconfig index 4cd562638..8d9d4e35f 100755 --- a/ltconfig +++ b/ltconfig @@ -549,6 +549,22 @@ else link_static_flag='-Bstatic' ;; + linux*aout) + can_build_shared=no + ;; + + linux*) + case "$CC" in + *lcc | *lcc\ *) + wl=-Wl + link_static_flag='-static' + pic_flag= + ;; + *) + can_build_shared=no + esac + ;; + *) can_build_shared=no ;; -- cgit v1.2.1