More unused stuff.

This commit is contained in:
William McBrine
2006-08-24 20:56:08 +00:00
parent 740c422115
commit c7929451b8
2 changed files with 6 additions and 42 deletions

19
aclocal.m4 vendored
View File

@@ -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 ---------------------------------------------------------------------------

29
configure vendored
View File

@@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h>
#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 <<EOF
#line 4674 "configure"
#line 4665 "configure"
int a=0
EOF
@@ -4710,7 +4701,7 @@ echo "${ECHO_T}none of $mh_cv_flags supported" >&6
mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5'
cat > conftest.$ac_ext <<EOF
#line 4713 "configure"
#line 4704 "configure"
int foo()
{
return(0);
@@ -4796,12 +4787,6 @@ fi
@@ -5456,15 +5441,10 @@ s,@PURIFY@,$PURIFY,;t t
s,@SHLPST@,$SHLPST,;t t
s,@MODPST@,$MODPST,;t t
s,@EEXTRA@,$EEXTRA,;t t
s,@OBJ@,$OBJ,;t t
s,@DYN_COMP@,$DYN_COMP,;t t
s,@LD_RXLIB1@,$LD_RXLIB1,;t t
s,@LD_RXTRANSLIB1@,$LD_RXTRANSLIB1,;t t
s,@SHLPRE@,$SHLPRE,;t t
s,@LIBPST@,$LIBPST,;t t
s,@LIBPRE@,$LIBPRE,;t t
s,@LIBEXE@,$LIBEXE,;t t
s,@LIBFLAGS@,$LIBFLAGS,;t t
s,@DYNAMIC_LDFLAGS@,$DYNAMIC_LDFLAGS,;t t
s,@SHL_TARGETS@,$SHL_TARGETS,;t t
s,@O2SAVE@,$O2SAVE,;t t
@@ -5472,7 +5452,6 @@ s,@O2SHO@,$O2SHO,;t t
s,@CC2O@,$CC2O,;t t
s,@SAVE2O@,$SAVE2O,;t t
s,@RXPACKEXPORTS@,$RXPACKEXPORTS,;t t
s,@RXPACKEXP@,$RXPACKEXP,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF