More things that don't seem to be necessary.

This commit is contained in:
William McBrine
2006-08-24 19:12:27 +00:00
parent 3a9e9b1a9c
commit 4cf05bc7f5
2 changed files with 3 additions and 59 deletions

25
aclocal.m4 vendored
View File

@@ -537,18 +537,13 @@ dnl
dnl If compiler is gcc, then flags should be the same for all platforms
dnl (just guessing on this)
dnl
OSAVE=".o.save"
OBJ="o"
EXE=""
STATIC_LDFLAGS=""
DYNAMIC_LDFLAGS=""
AIX_DYN="no"
BEOS_DYN="no"
SHLFILE="$1"
SHLFILES="$*"
RXPACKEXPORTS=""
BASE_INSTALL="installbase"
BASE_BINARY="binarybase"
SHLPRE="lib"
LD_RXLIB1=""
LD_RXTRANSLIB1="$LD_RXLIB1"
@@ -556,12 +551,6 @@ LIBEXE="ar"
LIBFLAGS="cr"
LIBPRE="lib"
LIBPST=".a"
# OTHER_INSTALLS is set to install a non-version numbered shared library
# by default; ie. no .\$(ABI) suffix. If the regina executable is not built,
# then there is no shared library. Set OTHER_INSTALLS="installabilib" if you
# are building a version numbered shared library.
OTHER_INSTALLS="installlib"
EXTRATARGET=""
AC_REQUIRE([AC_CANONICAL_SYSTEM])
case "$target" in
@@ -576,7 +565,6 @@ case "$target" in
SYS_DEFS="-D_ALL_SOURCE -DAIX"
AIX_DYN="yes"
DYN_COMP="-DDYNAMIC"
STATIC_LDFLAGS="-bnso -bI:/lib/syscalls.exp"
LD_RXLIB1="ld -bnoentry -bM:SRE"
LD_RXTRANSLIB1="$LD_RXLIB1"
RXPACKEXPORTS="-bE:$SHLFILE.exp"
@@ -637,9 +625,6 @@ case "$target" in
LD_RXLIB1="${CC} -Wl,-shared -nostart -Xlinker -soname=\$(@)"
LD_RXTRANSLIB1="$LD_RXLIB1"
BEOS_DYN="yes"
BASE_INSTALL="beosinstall"
BASE_BINARY="beosbinary"
OTHER_INSTALLS=""
;;
*nto-qnx*)
LD_RXLIB1="${CC} -shared"
@@ -658,16 +643,12 @@ case "$target" in
SHLPRE=""
DYN_COMP="-DDYNAMIC"
LIBPST=".a"
EXE=".exe"
# 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 \$(@)"
BASE_INSTALL="cygwininstall"
BASE_BINARY="cygwinbinary"
# cygwininstall target MUST install the shared library itself because
# it puts it into $(bindir) not $(libdir) as all other platforms
OTHER_INSTALLS=""
;;
*darwin*)
DYN_COMP="-fno-common"
@@ -748,9 +729,7 @@ if test "$ac_cv_header_dl_h" = "yes" -o "$ac_cv_header_dlfcn_h" = "yes" -o "$AIX
fi
AC_SUBST(EEXTRA)
AC_SUBST(OSAVE)
AC_SUBST(OBJ)
AC_SUBST(EXE)
AC_SUBST(DYN_COMP)
AC_SUBST(LIBS)
AC_SUBST(LD_RXLIB1)
@@ -762,14 +741,10 @@ AC_SUBST(LIBPRE)
AC_SUBST(LIBEXE)
AC_SUBST(LIBFLAGS)
AC_SUBST(DYNAMIC_LDFLAGS)
AC_SUBST(STATIC_LDFLAGS)
AC_SUBST(SHL_TARGETS)
AC_SUBST(O2SAVE)
AC_SUBST(O2SHO)
AC_SUBST(CC2O)
AC_SUBST(BASE_INSTALL)
AC_SUBST(OTHER_INSTALLS)
AC_SUBST(BASE_BINARY)
AC_SUBST(SAVE2O)
AC_SUBST(RXPACKEXPORTS)
AC_SUBST(RXPACKEXP)

37
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 OSAVE OBJ EXE DYN_COMP LD_RXLIB1 LD_RXTRANSLIB1 SHLPRE LIBPST LIBPRE LIBEXE LIBFLAGS DYNAMIC_LDFLAGS STATIC_LDFLAGS SHL_TARGETS O2SAVE O2SHO CC2O BASE_INSTALL OTHER_INSTALLS BASE_BINARY 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 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_files=''
# Initialize some variables set by options.
@@ -4552,18 +4552,13 @@ echo "${ECHO_T}$SHLPST/$MODPST" >&6
OSAVE=".o.save"
OBJ="o"
EXE=""
STATIC_LDFLAGS=""
DYNAMIC_LDFLAGS=""
AIX_DYN="no"
BEOS_DYN="no"
SHLFILE="XCurses"
SHLFILES="XCurses"
RXPACKEXPORTS=""
BASE_INSTALL="installbase"
BASE_BINARY="binarybase"
SHLPRE="lib"
LD_RXLIB1=""
LD_RXTRANSLIB1="$LD_RXLIB1"
@@ -4571,12 +4566,6 @@ LIBEXE="ar"
LIBFLAGS="cr"
LIBPRE="lib"
LIBPST=".a"
# OTHER_INSTALLS is set to install a non-version numbered shared library
# by default; ie. no .\$(ABI) suffix. If the regina executable is not built,
# then there is no shared library. Set OTHER_INSTALLS="installabilib" if you
# are building a version numbered shared library.
OTHER_INSTALLS="installlib"
EXTRATARGET=""
case "$target" in
@@ -4591,7 +4580,6 @@ case "$target" in
SYS_DEFS="-D_ALL_SOURCE -DAIX"
AIX_DYN="yes"
DYN_COMP="-DDYNAMIC"
STATIC_LDFLAGS="-bnso -bI:/lib/syscalls.exp"
LD_RXLIB1="ld -bnoentry -bM:SRE"
LD_RXTRANSLIB1="$LD_RXLIB1"
RXPACKEXPORTS="-bE:$SHLFILE.exp"
@@ -4652,9 +4640,6 @@ case "$target" in
LD_RXLIB1="${CC} -Wl,-shared -nostart -Xlinker -soname=\$(@)"
LD_RXTRANSLIB1="$LD_RXLIB1"
BEOS_DYN="yes"
BASE_INSTALL="beosinstall"
BASE_BINARY="beosbinary"
OTHER_INSTALLS=""
;;
*nto-qnx*)
LD_RXLIB1="${CC} -shared"
@@ -4673,16 +4658,12 @@ case "$target" in
SHLPRE=""
DYN_COMP="-DDYNAMIC"
LIBPST=".a"
EXE=".exe"
# 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 \$(@)"
BASE_INSTALL="cygwininstall"
BASE_BINARY="cygwinbinary"
# cygwininstall target MUST install the shared library itself because
# it puts it into $(bindir) not $(libdir) as all other platforms
OTHER_INSTALLS=""
;;
*darwin*)
DYN_COMP="-fno-common"
@@ -4698,7 +4679,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 4701 "configure"
#line 4682 "configure"
int a=0
EOF
@@ -4737,7 +4718,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 4740 "configure"
#line 4721 "configure"
int foo()
{
return(0);
@@ -4825,12 +4806,6 @@ fi
@@ -5489,9 +5464,7 @@ s,@PURIFY@,$PURIFY,;t t
s,@SHLPST@,$SHLPST,;t t
s,@MODPST@,$MODPST,;t t
s,@EEXTRA@,$EEXTRA,;t t
s,@OSAVE@,$OSAVE,;t t
s,@OBJ@,$OBJ,;t t
s,@EXE@,$EXE,;t t
s,@DYN_COMP@,$DYN_COMP,;t t
s,@LD_RXLIB1@,$LD_RXLIB1,;t t
s,@LD_RXTRANSLIB1@,$LD_RXTRANSLIB1,;t t
@@ -5501,14 +5474,10 @@ s,@LIBPRE@,$LIBPRE,;t t
s,@LIBEXE@,$LIBEXE,;t t
s,@LIBFLAGS@,$LIBFLAGS,;t t
s,@DYNAMIC_LDFLAGS@,$DYNAMIC_LDFLAGS,;t t
s,@STATIC_LDFLAGS@,$STATIC_LDFLAGS,;t t
s,@SHL_TARGETS@,$SHL_TARGETS,;t t
s,@O2SAVE@,$O2SAVE,;t t
s,@O2SHO@,$O2SHO,;t t
s,@CC2O@,$CC2O,;t t
s,@BASE_INSTALL@,$BASE_INSTALL,;t t
s,@OTHER_INSTALLS@,$OTHER_INSTALLS,;t t
s,@BASE_BINARY@,$BASE_BINARY,;t t
s,@SAVE2O@,$SAVE2O,;t t
s,@RXPACKEXPORTS@,$RXPACKEXPORTS,;t t
s,@RXPACKEXP@,$RXPACKEXP,;t t