use g_atexit() instead of ATEXIT.

Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edd5fecd7c0c94f3abeed3116d13970516ee5164..4011d028f65d0309623e447e8f61b3b418def007 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Tue Sep  8 05:19:51 1998  Tim Janik  <timj@gtk.org>
+
+       * 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 <yosh@gimp.org>
 
        * configure.in: comment the -std1 check and save LIBS properly

diff --git a/autogen.sh b/autogen.sh
index f4a29b18c6e6da6ef4de73c330aca8df1584ccc2..2f48d79b4add729acdc480d68a1154f50428264e 100755 (executable)
--- 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 5494657e7dc9aea65a7376beb458c22fa79c6a5d..867dadef60cf73dea188ed722e725cace65794ba 100644 (file)
--- 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 5494657e7dc9aea65a7376beb458c22fa79c6a5d..867dadef60cf73dea188ed722e725cace65794ba 100644 (file)
--- 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 28ecb3410f455875b780f3da907c4a76b1e5fae6..d40e0d97fed0f67ec3ee7288c0902ddfb9c01208 100644 (file)
--- 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 9a8014e4eec8a520aa27aea4e9f4095c32a07573..ed41b101267ffbcaabf4b04ce4ea225b0ed0533c 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -19,7 +19,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
 #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 4cd56263875515e8fc5c5c947b777544a0a3a7f5..8d9d4e35f7c503a75f56212a00707e75d4a8e1b0 100755 (executable)
--- 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
     ;;