diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 56 |
1 files changed, 17 insertions, 39 deletions
diff --git a/configure.in b/configure.in index 4345e2b3a9..a6e26f3ed2 100644 --- a/configure.in +++ b/configure.in @@ -44,12 +44,6 @@ AC_ARG_ENABLE(fat-binary, TARGET_ARCHS="ppc i386" fi ;; - macos*) - echo -n "MacOS X : " - if test "$TARGET_ARCHS" = "" ; then - TARGET_ARCHS="ppc i386" - fi - ;; nextstep*|openstep*) echo -n "NeXTSTEP/OPENSTEP: " if test "$TARGET_ARCHS" = "" ; then @@ -161,7 +155,6 @@ case "$target_os" in nextstep*) ;; openstep*) ;; rhapsody*) ;; -macos*) ;; human*) ac_cv_func_getpgrp_void=yes;; beos*) ;; cygwin*) ;; @@ -424,9 +417,9 @@ if test "$with_dln_a_out" != yes; then nextstep*) ;; openstep*) ;; rhapsody*) ;; - macos*) ;; human*) ;; bsdi*) ;; + beos*) ;; cygwin*) ;; mingw*) ;; netbsd*) CCDLFLAGS=-fpic @@ -504,10 +497,6 @@ if test "$with_dln_a_out" != yes; then LDFLAGS="" DLDFLAGS="$ARCH_FLAG" rb_cv_dlopen=yes ;; - macos*) LDSHARED='cc -dynamic -bundle -undefined suppress' - LDFLAGS="" - DLDFLAGS="$ARCH_FLAG" - rb_cv_dlopen=yes ;; aix*) LDSHARED='/usr/ccs/bin/ld' XLDFLAGS='-Wl,-bE:ruby.imp' DLDFLAGS='-eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc' @@ -521,14 +510,12 @@ if test "$with_dln_a_out" != yes; then beos*) case "$target_cpu" in powerpc*) LDSHARED="ld -xms" - DLDFLAGS="-f ruby.exp -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" + DLDFLAGS='-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' ;; i586*) LDSHARED="ld -shared" DLDFLAGS="-L/boot/develop/lib/x86 -lbe -lroot" ;; - *) - DLDFLAGS="ruby.def -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" esac rb_cv_dlopen=yes ;; cygwin*|mingw*) : ${LDSHARED="${DLLWRAP} --target=${target_os} --as=${AS} --dlltool-name=${DLLTOOL} --driver-name=${CC} --export-all -s"} @@ -576,8 +563,6 @@ else AC_DEFINE(DLEXT, ".bundle");; rhapsody*) DLEXT=bundle AC_DEFINE(DLEXT, ".bundle");; - macos*) DLEXT=bundle - AC_DEFINE(DLEXT, ".bundle");; os2_emx*) DLEXT=dll AC_DEFINE(DLEXT, ".dll");; cygwin*|mingw*) DLEXT=so @@ -605,8 +590,6 @@ case "$target_os" in STRIP='strip -A -n';; rhapsody*) STRIP='strip -A -n';; - macos*) - STRIP='strip -A -n';; esac EXTSTATIC= @@ -705,28 +688,9 @@ LIBRUBY_A='lib$(RUBY_INSTALL_NAME).a' LIBRUBY='$(LIBRUBY_A)' LIBRUBYARG='$(LIBRUBY_A)' SOLIBS= -if test "$target_os" = "beos"; then - LIBRUBY='$(LIBRUBY_SO)' - LIBRUBYARG='-l$(RUBY_INSTALL_NAME)' - SOLIBS='-lnet' - echo creating ruby.def - case "$target_cpu" in - powerpc*) - cp beos/ruby.def.in ruby.exp - CFLAGS="$CFLAGS -relax_pointers" - ;; - i586*) - LDFLAGS="$LDFLAGS -L." - ;; - *) - echo EXPORTS > ruby.def - cat beos/ruby.def.in >> ruby.def - ;; - esac -fi case "$target_os" in - cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|macos*|os2_emx*) + cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|os2_emx*) DLDLIBS="" ;; *) @@ -787,6 +751,13 @@ if test "$enable_shared" = 'yes'; then LIBRUBYARG='-L${prefix}/lib -Wl,lib$(RUBY_INSTALL_NAME).so' SOLIBS='-lm -lc' ;; + beos*) + case "$target_cpu" in + powerpc*) + LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; + esac + ;; cygwin*|mingw*) LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).a' LIBRUBY_ALIASES='' @@ -834,6 +805,13 @@ case "$target_os" in CFLAGS="$CFLAGS -std" fi ;; + beos*) + case "$target_cpu" in + powerpc*) + CFLAGS="$CFLAGS -relax_pointers" + ;; + esac + ;; cygwin*) LIBOBJS="$LIBOBJS strftime.o" ;; |