comparison configure.in @ 8618:f8b3ece45bda

use separate prefix for shllib and shlbin files
author John W. Eaton <jwe@octave.org>
date Wed, 28 Jan 2009 17:42:18 -0500
parents 08331c2fb00f
children f1534e248260
comparison
equal deleted inserted replaced
8617:4b26e9fbbb37 8618:f8b3ece45bda
1170 SHLEXT_VER='$(SHLEXT).$(version)' 1170 SHLEXT_VER='$(SHLEXT).$(version)'
1171 SHLLIB_VER='$(SHLLIB).$(version)' 1171 SHLLIB_VER='$(SHLLIB).$(version)'
1172 SHLBIN_VER='$(SHLBIN).$(version)' 1172 SHLBIN_VER='$(SHLBIN).$(version)'
1173 SHLLINKEXT= 1173 SHLLINKEXT=
1174 LIBPRE=lib 1174 LIBPRE=lib
1175 SHLLIBPRE=lib
1176 SHLBINPRE=lib
1175 SH_LD='$(CXX)' 1177 SH_LD='$(CXX)'
1176 SH_LDFLAGS=-shared 1178 SH_LDFLAGS=-shared
1177 DL_LD='$(SH_LD)' 1179 DL_LD='$(SH_LD)'
1178 DL_LDFLAGS='$(SH_LDFLAGS)' 1180 DL_LDFLAGS='$(SH_LDFLAGS)'
1179 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' 1181 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
1223 SHLLIB_VER='$(version).$(SHLLIB)' 1225 SHLLIB_VER='$(version).$(SHLLIB)'
1224 NO_OCT_FILE_STRIP=true 1226 NO_OCT_FILE_STRIP=true
1225 SONAME_FLAGS='-install_name $(octlibdir)/$@' 1227 SONAME_FLAGS='-install_name $(octlibdir)/$@'
1226 library_path_var=DYLD_LIBRARY_PATH 1228 library_path_var=DYLD_LIBRARY_PATH
1227 ;; 1229 ;;
1228 *-*-cygwin* | *-*-mingw*) 1230 *-*-mingw* | *-*-cygwin*)
1231 case "$canonical_host_type" in
1232 *-*-cygwin*)
1233 LIBPRE=cyg
1234 SHLLIBPRE=lib
1235 SHLBINPRE=cyg
1236 ;;
1237 esac
1229 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" 1238 DL_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc"
1230 CXXPICFLAG=
1231 CPICFLAG=
1232 FPICFLAG=
1233 SHLEXT=dll
1234 SHLLIB=dll.a
1235 SHLBIN=dll
1236 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base" 1239 SH_LDFLAGS="-shared -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base"
1237 SHLLINKEXT=.dll 1240 SONAME_FLAGS='-Wl,--out-implib=$(SHLLIBPRE)$(basename $@)$(SHLLIB)'
1238 SONAME_FLAGS='-Wl,--out-implib=$@.a' 1241 ;;
1239 library_path_var=PATH 1242
1240 ;;
1241 *-*-msdosmsvc) 1243 *-*-msdosmsvc)
1242 DL_LDFLAGS="-shared" 1244 DL_LDFLAGS="-shared"
1243 CPICFLAG= 1245 CPICFLAG=
1244 CXXPICFLAG= 1246 CXXPICFLAG=
1245 FPICFLAG= 1247 FPICFLAG=
1246 SHLEXT=dll 1248 SHLEXT=dll
1247 SHLLIB=lib 1249 SHLLIB=lib
1248 SHLBIN=dll 1250 SHLBIN=dll
1249 LIBPRE= 1251 LIBPRE=
1252 SHLLIBPRE=
1253 SHLBINPRE=
1250 SH_LDFLAGS="-shared" 1254 SH_LDFLAGS="-shared"
1251 if test -n "`echo $CFLAGS | grep -e '-g'`" -o -n "`echo $CXXFLAGS | grep -e '-g'`"; then 1255 if test -n "`echo $CFLAGS | grep -e '-g'`" -o -n "`echo $CXXFLAGS | grep -e '-g'`"; then
1252 DL_LDFLAGS="$DL_LDFLAGS -g" 1256 DL_LDFLAGS="$DL_LDFLAGS -g"
1253 SH_LDFLAGS="$SH_LDFLAGS -g" 1257 SH_LDFLAGS="$SH_LDFLAGS -g"
1254 fi 1258 fi
1348 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) 1352 AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER])
1349 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) 1353 AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER])
1350 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) 1354 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER])
1351 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) 1355 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT])
1352 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) 1356 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE])
1357 AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE])
1358 AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE])
1353 AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) 1359 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
1354 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) 1360 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
1355 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) 1361 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
1356 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) 1362 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
1357 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) 1363 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
1374 AC_SUBST(SHLEXT_VER) 1380 AC_SUBST(SHLEXT_VER)
1375 AC_SUBST(SHLLIB_VER) 1381 AC_SUBST(SHLLIB_VER)
1376 AC_SUBST(SHLBIN_VER) 1382 AC_SUBST(SHLBIN_VER)
1377 AC_SUBST(SHLLINKEXT) 1383 AC_SUBST(SHLLINKEXT)
1378 AC_SUBST(LIBPRE) 1384 AC_SUBST(LIBPRE)
1385 AC_SUBST(SHLLIBPRE)
1386 AC_SUBST(SHLBINPRE)
1379 AC_SUBST(SH_LD) 1387 AC_SUBST(SH_LD)
1380 AC_SUBST(SH_LDFLAGS) 1388 AC_SUBST(SH_LDFLAGS)
1381 AC_SUBST(DL_LD) 1389 AC_SUBST(DL_LD)
1382 AC_SUBST(DL_LDFLAGS) 1390 AC_SUBST(DL_LDFLAGS)
1383 AC_SUBST(MKOCTFILE_DL_LDFLAGS) 1391 AC_SUBST(MKOCTFILE_DL_LDFLAGS)