diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | gtk-config.in | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 3 | ||||
| -rwxr-xr-x | ltconfig | 1 | ||||
| -rw-r--r-- | ltmain.sh | 3 |
12 files changed, 85 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5d82374b61..d26bec35a9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5d82374b61..d26bec35a9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5d82374b61..d26bec35a9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5d82374b61..d26bec35a9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5d82374b61..d26bec35a9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5d82374b61..d26bec35a9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Wed May 12 03:00:56 CDT 1999 Shawn T. Amundson <amundson@gtk.org> + + * configure.in + gtk-config.in + ltconfig + ltmain.sh + gtk/Makefile.am: changes to compile nicely (with xlib) + on BeOS + Sat May 1 15:04:42 PDT 1999 Manish Singh <yosh@gimp.org> * acinclude.m4 diff --git a/configure.in b/configure.in index 84e46f9adc..9f6bd513cd 100644 --- a/configure.in +++ b/configure.in @@ -196,6 +196,20 @@ AC_TRY_RUN([#include <math.h> ) LIBS=$gtk_save_LIBS +MATH_LIB=-lm +GTK_LIBS_EXTRA= +AC_MSG_CHECKING(for the BeOS) +case $host in + *-*-beos*) + GTK_LIBS_EXTRA="-L\$(top_builddir_full)/gdk/.libs -lgdk" + MATH_LIB= + ;; + default) + ;; +esac +AC_SUBST(MATH_LIB) +AC_SUBST(GTK_LIBS_EXTRA) + dnl NeXTStep cc seems to need this AC_MSG_CHECKING([for extra flags for POSIX compliance]) AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], diff --git a/gtk-config.in b/gtk-config.in index 7783db73a5..846f826780 100644 --- a/gtk-config.in +++ b/gtk-config.in @@ -115,6 +115,6 @@ if test "$echo_libs" = "yes"; then fi done - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm + echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ @MATH_LIB@ fi diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 12472fedab..ffc635c683 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,5 +1,7 @@ ### Process this file with automake to produce Makefile.in +top_builddir_full=`cd \$(top_builddir); pwd` + gtkincludedir = $(includedir)/gtk lib_LTLIBRARIES = libgtk.la @@ -307,6 +309,7 @@ libgtk_la_LDFLAGS = \ @GLIB_DEPLIBS@ \ @x_ldflags@ \ @x_libs@ \ + @GTK_LIBS_EXTRA@ \ -lm # $(top_builddir)/gdk/libgdk.la @@ -1694,6 +1694,7 @@ beos*) library_names_spec='${libname}.so' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH + deplibs_check_method=pass_all lt_cv_dlopen="load_add_on" lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -788,6 +788,9 @@ compiler." # } # /* impgen.c ends here */ ;; + *-*-beos*) + allow_undefined=no + ;; *) allow_undefined=yes ;; |