diff options
| author | Martin Baulig <martin@home-of-linux.org> | 2000-02-22 19:58:58 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-02-22 19:58:58 +0000 |
| commit | 00d9dd7065fd7b4a3e55e27edb14925041dff141 (patch) | |
| tree | 66b5822ec28f14b8aac294f17854e916e57e2690 /libgtop-sysdeps.m4 | |
| parent | 0a3a0c1a349c615aedf281dd2657bcc8d5f7bc3a (diff) | |
| download | libgtop-00d9dd7065fd7b4a3e55e27edb14925041dff141.tar.gz | |
Added this to CVS and hacked it to use `$CC -shared' to create shared
2000-02-22 Martin Baulig <martin@home-of-linux.org>
* ltconfig: Added this to CVS and hacked it to use `$CC -shared'
to create shared libraries on Solaris.
* automake.sh: Don't run libtoolize on Solaris but use the CVS
version instead.
Diffstat (limited to 'libgtop-sysdeps.m4')
| -rw-r--r-- | libgtop-sysdeps.m4 | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4 index e3520516..8e236104 100644 --- a/libgtop-sysdeps.m4 +++ b/libgtop-sysdeps.m4 @@ -157,7 +157,7 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[ else with_modules=no fi - ]) + ],[with_modules=auto]) dynworks=false deps= @@ -167,8 +167,8 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[ AC_MSG_RESULT(yes) fi - if test x$with_modules = xyes; then - AC_MSG_CHECKING(whether dynamic modules work) + AC_MSG_CHECKING(whether dynamic modules work) + if test x$with_modules = xauto; then oLIBS="$LIBS" oCFLAGS="$CFLAGS" LIBS="`glib-config --libs gmodule`" @@ -186,20 +186,24 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[ ], dynworks=true, dynworks=false, dynworks=true) LIBS="$oLIBS" CFLAGS="$oCFLAGS" - fi - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then - libgtop_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config" - libgtop_deplibs_check=`$libgtop_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''\"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` - if test "x$libgtop_deplibs_check" = "xnone" || \ - test "x$libgtop_deplibs_check" = "xunknown" || \ - test "x$libgtop_deplibs_check" = "x"; then - dynworks=false + dnl Now we check to see if our libtool supports shared lib deps + dnl (in a rather ugly way even) + if $dynworks; then + libgtop_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config" + libgtop_deplibs_check=`$libgtop_libtool_config | \ + grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''\"]]' | \ + sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` + if test "x$libgtop_deplibs_check" = "xnone" || \ + test "x$libgtop_deplibs_check" = "xunknown" || \ + test "x$libgtop_deplibs_check" = "x"; then + dynworks=false + fi fi + elif test x$with_modules = xyes; then + dynworks=true + else + dynworks=false fi if $dynworks; then @@ -215,9 +219,9 @@ AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[ libgtop_dynamic_ldflags= fi - AC_SUBST(libgtop_dynamic_ldflags) - AC_MSG_RESULT($libgtop_use_gmodule) + + AC_SUBST(libgtop_dynamic_ldflags) ]) AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ |