diff --git a/aclocal.m4 b/aclocal.m4 index 4ae3dacc..dc93e48b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -389,7 +389,7 @@ CPPFLAGS="$save_CPPFLAGS" ])dnl dnl --------------------------------------------------------------------------- -dnl Check for presense of various libraries +dnl Check for presence of various libraries dnl --------------------------------------------------------------------------- AC_DEFUN([MH_CHECK_LIB], [ @@ -533,7 +533,6 @@ dnl dnl If compiler is gcc, then flags should be the same for all platforms dnl (just guessing on this) dnl -OBJ="o" DYNAMIC_LDFLAGS="" AIX_DYN="no" BEOS_DYN="no" @@ -543,10 +542,6 @@ RXPACKEXPORTS="" SHLPRE="lib" LD_RXLIB1="" LD_RXTRANSLIB1="$LD_RXLIB1" -LIBEXE="ar" -LIBFLAGS="cr" -LIBPRE="lib" -LIBPST=".a" AC_REQUIRE([AC_CANONICAL_SYSTEM]) case "$target" in @@ -627,22 +622,18 @@ case "$target" in LD_RXTRANSLIB1="$LD_RXLIB1" ;; *qnx*) - LIBPRE="" - LIBPST=".lib" SHLPRE="" DYN_COMP="-Q" # force no check for dynamic loading SHLFILE="" EEXTRA="-mf -N0x20000 -Q" ;; *cygwin) - LIBPRE="lib" SHLPRE="" DYN_COMP="-DDYNAMIC" - LIBPST=".a" # Only for Rexx/Trans do we produce an import library for the DLL we are # building LD_RXLIB1="dllwrap --def ./cygwin.def --target i386-cygwin32 --dllname \$(@)" - LD_RXTRANSLIB1="dllwrap --def \$(srcdir)/\$(basename \$(@))w32.def --output-lib ${LIBPRE}\$(basename \$(@))${LIBPST} --target i386-cygwin32 --dllname \$(@)" + LD_RXTRANSLIB1="dllwrap --def \$(srcdir)/\$(basename \$(@))w32.def --output-lib lib\$(basename \$(@)).a --target i386-cygwin32 --dllname \$(@)" # cygwininstall target MUST install the shared library itself because # it puts it into $(bindir) not $(libdir) as all other platforms ;; @@ -725,17 +716,12 @@ if test "$ac_cv_header_dl_h" = "yes" -o "$ac_cv_header_dlfcn_h" = "yes" -o "$AIX fi AC_SUBST(EEXTRA) -AC_SUBST(OBJ) AC_SUBST(DYN_COMP) AC_SUBST(LIBS) AC_SUBST(LD_RXLIB1) AC_SUBST(LD_RXTRANSLIB1) AC_SUBST(SHLPRE) AC_SUBST(SHLPST) -AC_SUBST(LIBPST) -AC_SUBST(LIBPRE) -AC_SUBST(LIBEXE) -AC_SUBST(LIBFLAGS) AC_SUBST(DYNAMIC_LDFLAGS) AC_SUBST(SHL_TARGETS) AC_SUBST(O2SAVE) @@ -743,7 +729,6 @@ AC_SUBST(O2SHO) AC_SUBST(CC2O) AC_SUBST(SAVE2O) AC_SUBST(RXPACKEXPORTS) -AC_SUBST(RXPACKEXP) ])dnl dnl --------------------------------------------------------------------------- diff --git a/configure b/configure index baffb263..fafa642f 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SYS_DEFS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP MH_EXTRA_LIBS MH_XINC_DIR MH_XLIBS PURIFY SHLPST MODPST EEXTRA OBJ DYN_COMP LD_RXLIB1 LD_RXTRANSLIB1 SHLPRE LIBPST LIBPRE LIBEXE LIBFLAGS DYNAMIC_LDFLAGS SHL_TARGETS O2SAVE O2SHO CC2O SAVE2O RXPACKEXPORTS RXPACKEXP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os SYS_DEFS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP MH_EXTRA_LIBS MH_XINC_DIR MH_XLIBS PURIFY SHLPST MODPST EEXTRA DYN_COMP LD_RXLIB1 LD_RXTRANSLIB1 SHLPRE DYNAMIC_LDFLAGS SHL_TARGETS O2SAVE O2SHO CC2O SAVE2O RXPACKEXPORTS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4544,7 +4544,6 @@ echo "${ECHO_T}$SHLPST/$MODPST" >&6 -OBJ="o" DYNAMIC_LDFLAGS="" AIX_DYN="no" BEOS_DYN="no" @@ -4554,10 +4553,6 @@ RXPACKEXPORTS="" SHLPRE="lib" LD_RXLIB1="" LD_RXTRANSLIB1="$LD_RXLIB1" -LIBEXE="ar" -LIBFLAGS="cr" -LIBPRE="lib" -LIBPST=".a" case "$target" in @@ -4638,22 +4633,18 @@ case "$target" in LD_RXTRANSLIB1="$LD_RXLIB1" ;; *qnx*) - LIBPRE="" - LIBPST=".lib" SHLPRE="" DYN_COMP="-Q" # force no check for dynamic loading SHLFILE="" EEXTRA="-mf -N0x20000 -Q" ;; *cygwin) - LIBPRE="lib" SHLPRE="" DYN_COMP="-DDYNAMIC" - LIBPST=".a" # Only for Rexx/Trans do we produce an import library for the DLL we are # building LD_RXLIB1="dllwrap --def ./cygwin.def --target i386-cygwin32 --dllname \$(@)" - LD_RXTRANSLIB1="dllwrap --def \$(srcdir)/\$(basename \$(@))w32.def --output-lib ${LIBPRE}\$(basename \$(@))${LIBPST} --target i386-cygwin32 --dllname \$(@)" + LD_RXTRANSLIB1="dllwrap --def \$(srcdir)/\$(basename \$(@))w32.def --output-lib lib\$(basename \$(@)).a --target i386-cygwin32 --dllname \$(@)" # cygwininstall target MUST install the shared library itself because # it puts it into $(bindir) not $(libdir) as all other platforms ;; @@ -4671,7 +4662,7 @@ echo "$as_me:$LINENO: checking compiler flags for a dynamic object" >&5 echo $ECHO_N "checking compiler flags for a dynamic object... $ECHO_C" >&6 cat > conftest.$ac_ext <&6 mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5' cat > conftest.$ac_ext <