Mercurial > hg > octave-nkf
changeset 2357:5ac79d79da10
[project @ 1996-08-21 02:43:44 by jwe]
author | jwe |
---|---|
date | Wed, 21 Aug 1996 02:43:44 +0000 |
parents | de9eb7bd4405 |
children | b3d7a8e3bcc7 |
files | ChangeLog configure.in |
diffstat | 2 files changed, 41 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 20 21:40:26 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: Always set FPICFLAG, CPICFLAG, CXXPICFLAG, SHLEXT, + RLD_FLAG, DLFCN_DIR, even if SHARED_LIBS is false. + Thu Aug 15 14:39:07 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in (gxx_version, gcc_version): Strip out cygnus- from
--- a/configure.in +++ b/configure.in @@ -20,7 +20,7 @@ ### along with Octave; see the file COPYING. If not, write to the Free ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_REVISION($Revision: 1.213 $) +AC_REVISION($Revision: 1.214 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -363,49 +363,41 @@ AC_SUBST(SHARED_LIBS) DLFCN_DIR= -if $SHARED_LIBS; then - CPICFLAG=-fPIC - CXXPICFLAG=-fPIC - FPICFLAG=-fPIC - SHLEXT=so - RLD_FLAG= - case "$canonical_host_type" in - alpha-dec-osf*) - CPICFLAG= - CXXPICFLAG= - FPICFLAG= - RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' - ;; - rs6000-ibm-aix* | powerpc-ibm-aix*) - CPICFLAG= - CXXPICFLAG= - FPICFLAG= - DLFCN_DIR=dlfcn - ;; - hppa*-hp-hpux*) - FPICFLAG=+Z - SHLEXT=sl - RLD_FLAG='-Xlinker +b -Xlinker $(libdir)' - ;; - *-sgi-*) - FPICFLAG=-KPIC - ;; - sparc-sun-sunos4*) - FPICFLAG=-PIC - RLD_FLAG='-L $(libdir)' - ;; - sparc-sun-solaris2*) - FPICFLAG=-PIC - RLD_FLAG='-Xlinker -R -Xlinker $(libdir)' - ;; - esac -else - FPICFLAG= - CPICFLAG= - CXXPICFLAG= - SHLEXT= - RLD_FLAG= -fi +CPICFLAG=-fPIC +CXXPICFLAG=-fPIC +FPICFLAG=-fPIC +SHLEXT=so +RLD_FLAG= +case "$canonical_host_type" in + alpha-dec-osf*) + CPICFLAG= + CXXPICFLAG= + FPICFLAG= + RLD_FLAG='-Xlinker -rpath -Xlinker $(libdir)' + ;; + rs6000-ibm-aix* | powerpc-ibm-aix*) + CPICFLAG= + CXXPICFLAG= + FPICFLAG= + DLFCN_DIR=dlfcn + ;; + hppa*-hp-hpux*) + FPICFLAG=+Z + SHLEXT=sl + RLD_FLAG='-Xlinker +b -Xlinker $(libdir)' + ;; + *-sgi-*) + FPICFLAG=-KPIC + ;; + sparc-sun-sunos4*) + FPICFLAG=-PIC + RLD_FLAG='-L $(libdir)' + ;; + sparc-sun-solaris2*) + FPICFLAG=-PIC + RLD_FLAG='-Xlinker -R -Xlinker $(libdir)' + ;; +esac AC_MSG_RESULT([defining FPICFLAG to be $FPICFLAG]) AC_MSG_RESULT([defining CPICFLAG to be $CPICFLAG]) AC_MSG_RESULT([defining CXXPICFLAG to be $CXXPICFLAG])