comparison configure.in @ 6051:583c98eeeae2

[project @ 2006-10-13 18:11:26 by jwe]
author jwe
date Fri, 13 Oct 2006 18:11:27 +0000
parents 04c2ad6d1679
children 1297bb9a3ad0
comparison
equal deleted inserted replaced
6050:435294ca4ee6 6051:583c98eeeae2
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.525 $) 32 AC_REVISION($Revision: 1.526 $)
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
950 SHLBIN= 950 SHLBIN=
951 SHLEXT_VER='$(SHLEXT).$(version)' 951 SHLEXT_VER='$(SHLEXT).$(version)'
952 SHLLIB_VER='$(SHLLIB).$(version)' 952 SHLLIB_VER='$(SHLLIB).$(version)'
953 SHLBIN_VER='$(SHLBIN).$(version)' 953 SHLBIN_VER='$(SHLBIN).$(version)'
954 SHLLINKEXT= 954 SHLLINKEXT=
955 LIBPRE=lib
955 SH_LD='$(CXX)' 956 SH_LD='$(CXX)'
956 SH_LDFLAGS=-shared 957 SH_LDFLAGS=-shared
957 DL_LD='$(SH_LD)' 958 DL_LD='$(SH_LD)'
958 DL_LDFLAGS='$(SH_LDFLAGS)' 959 DL_LDFLAGS='$(SH_LDFLAGS)'
959 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' 960 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
1006 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" 1007 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
1007 SHLLINKEXT=.dll 1008 SHLLINKEXT=.dll
1008 SONAME_FLAGS='-Wl,--out-implib=$@.a' 1009 SONAME_FLAGS='-Wl,--out-implib=$@.a'
1009 library_path_var=PATH 1010 library_path_var=PATH
1010 ;; 1011 ;;
1012 *-*-msdos)
1013 DL_LDFLAGS="-shared -g"
1014 CPICFLAG=
1015 CXXPICFLAG=
1016 FPICFLAG=
1017 SHLEXT=dll
1018 SHLLIB=lib
1019 SHLBIN=dll
1020 LIBPRE=
1021 SH_LDFLAGS="-shared -g"
1022 ;;
1011 *-*-linux* | *-*-gnu*) 1023 *-*-linux* | *-*-gnu*)
1012 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" 1024 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
1013 SONAME_FLAGS='-Wl,-soname -Wl,$@' 1025 SONAME_FLAGS='-Wl,-soname -Wl,$@'
1014 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)' 1026 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
1015 ;; 1027 ;;
1095 AC_MSG_NOTICE([defining SHLBIN to be $SHLBIN]) 1107 AC_MSG_NOTICE([defining SHLBIN to be $SHLBIN])
1096 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) 1108 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER])
1097 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) 1109 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER])
1098 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) 1110 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER])
1099 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) 1111 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT])
1112 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE])
1100 AC_MSG_NOTICE([defining DLFCN_DIR to be $DLFCN_DIR]) 1113 AC_MSG_NOTICE([defining DLFCN_DIR to be $DLFCN_DIR])
1101 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) 1114 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
1102 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) 1115 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
1103 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) 1116 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
1104 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) 1117 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
1117 AC_SUBST(SHLBIN) 1130 AC_SUBST(SHLBIN)
1118 AC_SUBST(SHLEXT_VER) 1131 AC_SUBST(SHLEXT_VER)
1119 AC_SUBST(SHLLIB_VER) 1132 AC_SUBST(SHLLIB_VER)
1120 AC_SUBST(SHLBIN_VER) 1133 AC_SUBST(SHLBIN_VER)
1121 AC_SUBST(SHLLINKEXT) 1134 AC_SUBST(SHLLINKEXT)
1135 AC_SUBST(LIBPRE)
1122 AC_SUBST(DLFCN_DIR) 1136 AC_SUBST(DLFCN_DIR)
1123 AC_SUBST(SH_LD) 1137 AC_SUBST(SH_LD)
1124 AC_SUBST(SH_LDFLAGS) 1138 AC_SUBST(SH_LDFLAGS)
1125 AC_SUBST(DL_LD) 1139 AC_SUBST(DL_LD)
1126 AC_SUBST(DL_LDFLAGS) 1140 AC_SUBST(DL_LDFLAGS)
1763 #define SIZEOF_OCTAVE_IDX_TYPE 8 1777 #define SIZEOF_OCTAVE_IDX_TYPE 8
1764 #else 1778 #else
1765 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT 1779 #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT
1766 #endif 1780 #endif
1767 1781
1782 #if defined (_MSC_VER)
1783 /* missing parameters in macros */
1784 #pragma warning (disable: 4003)
1785 /* missing implementations in template instantiation */
1786 #pragma warning (disable: 4996)
1787 /* deprecated function names (FIXME?) */
1788 #pragma warning (disable: 4661)
1789 #endif
1790
1768 #include "oct-types.h" 1791 #include "oct-types.h"
1769 ]) 1792 ])
1770 1793
1771 ### Do the substitutions in all the Makefiles. 1794 ### Do the substitutions in all the Makefiles.
1772 1795