diff options
| author | CDT 1999 Shawn T. Amundson <amundson@gtk.org> | 1999-05-08 11:04:26 +0000 |
|---|---|---|
| committer | Shawn Amundson <amundson@src.gnome.org> | 1999-05-08 11:04:26 +0000 |
| commit | 0e7f2f16f7c8b2ebfc0c8e8ed0761d665542a420 (patch) | |
| tree | 7b4c377d379349f3d48469e3b43129065f726c01 /configure.in | |
| parent | 4553b33fa8bc1403a63e514222641bdb72de8a3c (diff) | |
| download | glib-0e7f2f16f7c8b2ebfc0c8e8ed0761d665542a420.tar.gz | |
Better testing reveals better methods. Fixes for BeOS.
Sat May 8 06:00:17 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* configure.in
gmodule/Makefile.am
gthread/Makefile.am: Better testing reveals better
methods. Fixes for BeOS.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 03b58ffc3..e459f6e24 100644 --- a/configure.in +++ b/configure.in @@ -459,6 +459,7 @@ dnl *********************** dnl *** g_module checks *** dnl *********************** G_MODULE_LIBS= +G_MODULE_LIBS_EXTRA= G_MODULE_PLUGIN_LIBS= G_MODULE_LDFLAGS= dnl G_MODULE_IMPL= don't reset, so cmd-line can override @@ -475,7 +476,8 @@ fi dnl *** load_image (BeOS) if test -z "$G_MODULE_IMPL" -a "x$glib_native_beos" = "xyes"; then AC_CHECK_LIB(root, load_image, - G_MODULE_LIBS="-lbe -lroot -L\$(top_builddir_full)/.libs -lglib" + G_MODULE_LIBS="-lbe -lroot -lglib" + G_MODULE_LIBS_EXTRA="-L\$(top_builddir_full)/.libs" G_MODULE_PLUGIN_LIBS="-L\$(top_builddir_full)/gmodule/.libs -lgmodule" G_MODULE_IMPL=G_MODULE_IMPL_BEOS ,) @@ -562,6 +564,7 @@ if test -z "$G_MODULE_IMPL"; then fi AC_SUBST(G_MODULE_IMPL) AC_SUBST(G_MODULE_LIBS) +AC_SUBST(G_MODULE_LIBS_EXTRA) AC_SUBST(G_MODULE_PLUGIN_LIBS) AC_SUBST(G_MODULE_LDFLAGS) AC_SUBST(G_MODULE_HAVE_DLERROR) @@ -663,6 +666,7 @@ dnl determination of G_THREAD_LIBS dnl ****************************** G_THREAD_LIBS= +G_THREAD_LIBS_EXTRA= G_THREAD_CFLAGS= mutex_has_default=no @@ -733,7 +737,8 @@ fi case $host in *-*-beos*) - G_THREAD_LIBS="-lbe -lroot -L\$(top_builddir_full)/.libs -lglib " + G_THREAD_LIBS="-lbe -lroot -lglib " + G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs" ;; *) ;; @@ -840,6 +845,7 @@ fi AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c") AC_SUBST(G_THREAD_CFLAGS) AC_SUBST(G_THREAD_LIBS) +AC_SUBST(G_THREAD_LIBS_EXTRA) CFLAGS="$CFLAGS $G_THREAD_CFLAGS" |