comparison configure.in @ 7253:c5a024013d2d

[project @ 2007-12-04 20:51:24 by jwe]
author jwe
date Tue, 04 Dec 2007 20:51:26 +0000
parents 5a9561046b89
children b42f8f3527a5
comparison
equal deleted inserted replaced
7252:d35fa45980c6 7253:c5a024013d2d
27 27
28 EXTERN_CFLAGS="$CFLAGS" 28 EXTERN_CFLAGS="$CFLAGS"
29 EXTERN_CXXFLAGS="$CXXFLAGS" 29 EXTERN_CXXFLAGS="$CXXFLAGS"
30 30
31 AC_INIT 31 AC_INIT
32 AC_REVISION($Revision: 1.599 $) 32 AC_REVISION($Revision: 1.600 $)
33 AC_PREREQ(2.57) 33 AC_PREREQ(2.57)
34 AC_CONFIG_SRCDIR([src/octave.cc]) 34 AC_CONFIG_SRCDIR([src/octave.cc])
35 AC_CONFIG_HEADER(config.h) 35 AC_CONFIG_HEADER(config.h)
36 36
37 OCTAVE_HOST_TYPE 37 OCTAVE_HOST_TYPE
937 use_rpath=true 937 use_rpath=true
938 if test "$enableval" = yes; then true; 938 if test "$enableval" = yes; then true;
939 else enable_rpath_arg="$enableval"; fi 939 else enable_rpath_arg="$enableval"; fi
940 fi], [use_rpath=true]) 940 fi], [use_rpath=true])
941 941
942 DLFCN_DIR=
943 CPICFLAG=-fPIC 942 CPICFLAG=-fPIC
944 CXXPICFLAG=-fPIC 943 CXXPICFLAG=-fPIC
945 FPICFLAG=-fPIC 944 FPICFLAG=-fPIC
946 SHLEXT=so 945 SHLEXT=so
947 SHLLIB='$(SHLEXT)' 946 SHLLIB='$(SHLEXT)'
1048 ;; 1047 ;;
1049 rs6000-ibm-aix* | powerpc-ibm-aix*) 1048 rs6000-ibm-aix* | powerpc-ibm-aix*)
1050 CPICFLAG= 1049 CPICFLAG=
1051 CXXPICFLAG= 1050 CXXPICFLAG=
1052 FPICFLAG= 1051 FPICFLAG=
1053 DLFCN_DIR=dlfcn
1054 ;; 1052 ;;
1055 hppa*-hp-hpux*) 1053 hppa*-hp-hpux*)
1056 if test "$ac_cv_f77_compiler_gnu" = yes; then 1054 if test "$ac_cv_f77_compiler_gnu" = yes; then
1057 FPICFLAG=-fPIC 1055 FPICFLAG=-fPIC
1058 else 1056 else
1124 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) 1122 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER])
1125 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) 1123 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER])
1126 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) 1124 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER])
1127 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) 1125 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT])
1128 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) 1126 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE])
1129 AC_MSG_NOTICE([defining DLFCN_DIR to be $DLFCN_DIR])
1130 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) 1127 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
1131 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) 1128 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
1132 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) 1129 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
1133 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) 1130 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
1134 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) 1131 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
1150 AC_SUBST(SHLEXT_VER) 1147 AC_SUBST(SHLEXT_VER)
1151 AC_SUBST(SHLLIB_VER) 1148 AC_SUBST(SHLLIB_VER)
1152 AC_SUBST(SHLBIN_VER) 1149 AC_SUBST(SHLBIN_VER)
1153 AC_SUBST(SHLLINKEXT) 1150 AC_SUBST(SHLLINKEXT)
1154 AC_SUBST(LIBPRE) 1151 AC_SUBST(LIBPRE)
1155 AC_SUBST(DLFCN_DIR)
1156 AC_SUBST(SH_LD) 1152 AC_SUBST(SH_LD)
1157 AC_SUBST(SH_LDFLAGS) 1153 AC_SUBST(SH_LDFLAGS)
1158 AC_SUBST(DL_LD) 1154 AC_SUBST(DL_LD)
1159 AC_SUBST(DL_LDFLAGS) 1155 AC_SUBST(DL_LDFLAGS)
1160 AC_SUBST(MKOCTFILE_DL_LDFLAGS) 1156 AC_SUBST(MKOCTFILE_DL_LDFLAGS)
1342 1338
1343 ### Dynamic linking is now enabled only if we are building shared 1339 ### Dynamic linking is now enabled only if we are building shared
1344 ### libs and some API for dynamic linking is detected. 1340 ### libs and some API for dynamic linking is detected.
1345 1341
1346 LD_CXX='$(CXX)' 1342 LD_CXX='$(CXX)'
1347 LIBDLFCN=
1348 DLFCN_INCFLAGS=
1349 RDYNAMIC_FLAG= 1343 RDYNAMIC_FLAG=
1350 DL_API_MSG="" 1344 DL_API_MSG=""
1351 dlopen_api=false 1345 dlopen_api=false
1352 shl_load_api=false 1346 shl_load_api=false
1353 loadlibrary_api=false 1347 loadlibrary_api=false
1379 && test "$ac_cv_func_dlopen" = yes \ 1373 && test "$ac_cv_func_dlopen" = yes \
1380 && test "$ac_cv_func_dlsym" = yes; then 1374 && test "$ac_cv_func_dlsym" = yes; then
1381 dlopen_api=true 1375 dlopen_api=true
1382 else 1376 else
1383 case "$canonical_host_type" in 1377 case "$canonical_host_type" in
1384 rs6000-ibm-aix* | powerpc-ibm-aix*)
1385 LIBDLFCN="-ldlfcn -ll -lld"
1386 DLFCN_INCFLAGS='-I$(top_srcdir)/dlfcn -I$(TOPDIR)/dlfcn'
1387 dlopen_api=true
1388 ;;
1389 i[[3456]]86-*-sco3.2v5*) 1378 i[[3456]]86-*-sco3.2v5*)
1390 LD_CXX='LD_RUN_PATH=$LD_RUN_PATH:$(octlibdir) $(CXX)' 1379 LD_CXX='LD_RUN_PATH=$LD_RUN_PATH:$(octlibdir) $(CXX)'
1391 dlopen_api=true 1380 dlopen_api=true
1392 ;; 1381 ;;
1393 esac 1382 esac
1437 LIBOCTAVE='$(TOPDIR)/liboctave/liboctave.$(LIBEXT)' 1426 LIBOCTAVE='$(TOPDIR)/liboctave/liboctave.$(LIBEXT)'
1438 LIBCRUFT='$(TOPDIR)/libcruft/libcruft.$(LIBEXT)' 1427 LIBCRUFT='$(TOPDIR)/libcruft/libcruft.$(LIBEXT)'
1439 fi 1428 fi
1440 1429
1441 AC_SUBST(LD_CXX) 1430 AC_SUBST(LD_CXX)
1442 AC_SUBST(LIBDLFCN)
1443 AC_SUBST(DLFCN_INCFLAGS)
1444 AC_SUBST(RDYNAMIC_FLAG) 1431 AC_SUBST(RDYNAMIC_FLAG)
1445 AC_SUBST(ENABLE_DYNAMIC_LINKING) 1432 AC_SUBST(ENABLE_DYNAMIC_LINKING)
1446 AC_SUBST(LIBOCTINTERP) 1433 AC_SUBST(LIBOCTINTERP)
1447 AC_SUBST(LIBOCTAVE) 1434 AC_SUBST(LIBOCTAVE)
1448 AC_SUBST(LIBCRUFT) 1435 AC_SUBST(LIBCRUFT)
1830 #include "oct-types.h" 1817 #include "oct-types.h"
1831 ]) 1818 ])
1832 1819
1833 ### Do the substitutions in all the Makefiles. 1820 ### Do the substitutions in all the Makefiles.
1834 1821
1835 AC_CONFIG_FILES([Makefile octMakefile Makeconf test/Makefile \ 1822 AC_CONFIG_FILES([Makefile octMakefile Makeconf test/Makefile
1836 dlfcn/Makefile doc/Makefile doc/faq/Makefile doc/interpreter/Makefile 1823 doc/Makefile doc/faq/Makefile doc/interpreter/Makefile
1837 doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile \ 1824 doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile
1838 examples/Makefile liboctave/Makefile liboctave/oct-types.h \ 1825 examples/Makefile liboctave/Makefile liboctave/oct-types.h
1839 src/Makefile src/mxarray.h libcruft/Makefile libcruft/Makerules \ 1826 src/Makefile src/mxarray.h libcruft/Makefile libcruft/Makerules
1840 libcruft/amos/Makefile libcruft/blas/Makefile \ 1827 libcruft/amos/Makefile libcruft/blas/Makefile
1841 libcruft/daspk/Makefile libcruft/dasrt/Makefile 1828 libcruft/daspk/Makefile libcruft/dasrt/Makefile
1842 libcruft/dassl/Makefile libcruft/fftpack/Makefile \ 1829 libcruft/dassl/Makefile libcruft/fftpack/Makefile
1843 libcruft/lapack/Makefile libcruft/minpack/Makefile \ 1830 libcruft/lapack/Makefile libcruft/minpack/Makefile
1844 libcruft/misc/Makefile libcruft/odepack/Makefile \ 1831 libcruft/misc/Makefile libcruft/odepack/Makefile
1845 libcruft/ordered-qz/Makefile libcruft/quadpack/Makefile \ 1832 libcruft/ordered-qz/Makefile libcruft/quadpack/Makefile
1846 libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile \ 1833 libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile
1847 libcruft/slatec-err/Makefile libcruft/villad/Makefile \ 1834 libcruft/slatec-err/Makefile libcruft/villad/Makefile
1848 libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile]) 1835 libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile])
1849 AC_OUTPUT 1836 AC_OUTPUT
1850 1837
1851 AC_CONFIG_COMMANDS([default-1],[[chmod +x install-octave]],[[]]) 1838 AC_CONFIG_COMMANDS([default-1],[[chmod +x install-octave]],[[]])
1852 1839