Mercurial > octave

comparison configure.ac @ 13016:6b0798860fa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: let libtool deal with setting -rpath linker option * configure.ac (--enable-rpath): Delete option handler. (RLD_FLAG): Delete variable and all uses. * common.mk (RLD_FLAG): Don't substitute it. (do_subst_config_vals): Don't substitute OCTAVE_CONF_RLD_FLAG. * oct-conf.h.in (OCTAVE_CONF_RLD_FLAG): Delete definition. * toplev.cc (octave_config_info): Delete RLD_FLAG from the list. * libcruft/Makefile.am, liboctave/Makefile.am, src/Makefile.am, src/link-deps.mk: Don't add RLD_FLAG to link options.
author John W. Eaton <jwe@octave.org>
date Sat, 27 Aug 2011 11:28:48 -0400
parents edc5ec6e949b
children f3c53fea9fb5
comparison
equal deleted inserted replaced
13015:143003684835 13016:6b0798860fa4
1168 true 1168 true
1169 else 1169 else
1170 AC_MSG_ERROR([You can't disable building static AND shared libraries!]) 1170 AC_MSG_ERROR([You can't disable building static AND shared libraries!])
1171 fi 1171 fi
1172 1172
1173 AC_ARG_ENABLE(rpath,
1174 [AS_HELP_STRING([--enable-rpath],
1175 [override the default link options for rpath; e.g., --enable-rpath='-rpath $(octlibdir)'])],
1176 [ if test "$enableval" = no; then use_rpath=false;
1177 else
1178 use_rpath=true
1179 if test "$enableval" = yes; then true;
1180 else enable_rpath_arg="$enableval"; fi
1181 fi], [use_rpath=true])
1182
1183 CPICFLAG=-fPIC 1173 CPICFLAG=-fPIC
1184 CXXPICFLAG=-fPIC 1174 CXXPICFLAG=-fPIC
1185 FPICFLAG=-fPIC 1175 FPICFLAG=-fPIC
1186 SHLEXT=so 1176 SHLEXT=so
1187 SHLLIB='$(SHLEXT)' 1177 SHLLIB='$(SHLEXT)'
1198 SH_LDFLAGS=-shared 1188 SH_LDFLAGS=-shared
1199 DL_LD='$(SH_LD)' 1189 DL_LD='$(SH_LD)'
1200 DL_LDFLAGS='$(SH_LDFLAGS)' 1190 DL_LDFLAGS='$(SH_LDFLAGS)'
1201 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)' 1191 MKOCTFILE_DL_LDFLAGS='$(DL_LDFLAGS)'
1202 SONAME_FLAGS= 1192 SONAME_FLAGS=
1203 RLD_FLAG=
1204 NO_OCT_FILE_STRIP=false 1193 NO_OCT_FILE_STRIP=false
1205 TEMPLATE_AR='$(AR)' 1194 TEMPLATE_AR='$(AR)'
1206 TEMPLATE_ARFLAGS="$ARFLAGS" 1195 TEMPLATE_ARFLAGS="$ARFLAGS"
1207 CRUFT_DLL_DEFS= 1196 CRUFT_DLL_DEFS=
1208 OCTAVE_DLL_DEFS= 1197 OCTAVE_DLL_DEFS=
1219 *-*-openbsd*) 1208 *-*-openbsd*)
1220 SH_LDFLAGS='-shared -fPIC' 1209 SH_LDFLAGS='-shared -fPIC'
1221 ;; 1210 ;;
1222 *-*-freebsd*) 1211 *-*-freebsd*)
1223 SH_LDFLAGS="-shared -Wl,-x" 1212 SH_LDFLAGS="-shared -Wl,-x"
1224 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
1225 ;; 1213 ;;
1226 alpha*-dec-osf*) 1214 alpha*-dec-osf*)
1227 CPICFLAG= 1215 CPICFLAG=
1228 CXXPICFLAG= 1216 CXXPICFLAG=
1229 FPICFLAG= 1217 FPICFLAG=
1230 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" 1218 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
1231 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
1232 ;; 1219 ;;
1233 *-*-darwin*) 1220 *-*-darwin*)
1234 DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/src/octave $(LDFLAGS)' 1221 DL_LDFLAGS='-bundle -bundle_loader $(top_builddir)/src/octave $(LDFLAGS)'
1235 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT' 1222 MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
1236 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)' 1223 SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
1333 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL" 1320 OCTGRAPHICS_DLL_DEFS="-DOCTGRAPHICS_DLL"
1334 ;; 1321 ;;
1335 *-*-linux* | *-*-gnu*) 1322 *-*-linux* | *-*-gnu*)
1336 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic" 1323 MKOCTFILE_DL_LDFLAGS="-shared -Wl,-Bsymbolic"
1337 SONAME_FLAGS='-Wl,-soname -Wl,$@' 1324 SONAME_FLAGS='-Wl,-soname -Wl,$@'
1338 RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
1339 ;; 1325 ;;
1340 i[[3456]]86-*-sco3.2v5*) 1326 i[[3456]]86-*-sco3.2v5*)
1341 SONAME_FLAGS='-Wl,-h -Wl,$@' 1327 SONAME_FLAGS='-Wl,-h -Wl,$@'
1342 RLD_FLAG=
1343 SH_LDFLAGS=-G 1328 SH_LDFLAGS=-G
1344 ;; 1329 ;;
1345 rs6000-ibm-aix* | powerpc-ibm-aix*) 1330 rs6000-ibm-aix* | powerpc-ibm-aix*)
1346 CPICFLAG= 1331 CPICFLAG=
1347 CXXPICFLAG= 1332 CXXPICFLAG=
1354 else 1339 else
1355 FPICFLAG=+Z 1340 FPICFLAG=+Z
1356 fi 1341 fi
1357 SHLEXT=sl 1342 SHLEXT=sl
1358 SH_LDFLAGS="-shared -fPIC" 1343 SH_LDFLAGS="-shared -fPIC"
1359 RLD_FLAG='-Wl,+b -Wl,$(octlibdir)'
1360 library_path_var=SHLIB_PATH 1344 library_path_var=SHLIB_PATH
1361 ;; 1345 ;;
1362 ia64*-hp-hpux*) 1346 ia64*-hp-hpux*)
1363 if test "$ac_cv_f77_compiler_gnu" = yes; then 1347 if test "$ac_cv_f77_compiler_gnu" = yes; then
1364 FPICFLAG=-fPIC 1348 FPICFLAG=-fPIC
1365 else 1349 else
1366 FPICFLAG=+Z 1350 FPICFLAG=+Z
1367 fi 1351 fi
1368 SH_LDFLAGS="-shared -fPIC" 1352 SH_LDFLAGS="-shared -fPIC"
1369 RLD_FLAG='-Wl,+b -Wl,$(octlibdir)'
1370 ;; 1353 ;;
1371 *-sgi-*) 1354 *-sgi-*)
1372 CPICFLAG= 1355 CPICFLAG=
1373 CXXPICFLAG= 1356 CXXPICFLAG=
1374 FPICFLAG= 1357 FPICFLAG=
1375 RLD_FLAG='-rpath $(octlibdir)'
1376 ;; 1358 ;;
1377 sparc-sun-sunos4*) 1359 sparc-sun-sunos4*)
1378 if test "$ac_cv_f77_compiler_gnu" = yes; then 1360 if test "$ac_cv_f77_compiler_gnu" = yes; then
1379 FPICFLAG=-fPIC 1361 FPICFLAG=-fPIC
1380 else 1362 else
1381 FPICFLAG=-PIC 1363 FPICFLAG=-PIC
1382 fi 1364 fi
1383 SH_LD=ld 1365 SH_LD=ld
1384 SH_LDFLAGS="-assert nodefinitions" 1366 SH_LDFLAGS="-assert nodefinitions"
1385 RLD_FLAG='-L$(octlibdir)'
1386 ;; 1367 ;;
1387 sparc-sun-solaris2* | i386-pc-solaris2*) 1368 sparc-sun-solaris2* | i386-pc-solaris2*)
1388 if test "$ac_cv_f77_compiler_gnu" = yes; then 1369 if test "$ac_cv_f77_compiler_gnu" = yes; then
1389 FPICFLAG=-fPIC 1370 FPICFLAG=-fPIC
1390 else 1371 else
1400 SH_LDFLAGS=-shared 1381 SH_LDFLAGS=-shared
1401 else 1382 else
1402 CXXPICFLAG=-KPIC 1383 CXXPICFLAG=-KPIC
1403 SH_LDFLAGS=-G 1384 SH_LDFLAGS=-G
1404 fi 1385 fi
1405 RLD_FLAG='-R $(octlibdir)'
1406 ## Template closures in archive libraries need a different mechanism. 1386 ## Template closures in archive libraries need a different mechanism.
1407 if test "$GXX" = yes; then 1387 if test "$GXX" = yes; then
1408 true 1388 true
1409 else 1389 else
1410 TEMPLATE_AR='$(CXX)' 1390 TEMPLATE_AR='$(CXX)'
1413 ;; 1393 ;;
1414 esac 1394 esac
1415 1395
1416 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], 1396 AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS],
1417 [test x$BUILD_COMPILED_AUX_PROGRAMS = xtrue]) 1397 [test x$BUILD_COMPILED_AUX_PROGRAMS = xtrue])
1418
1419 if $use_rpath; then
1420 if test -n "$enable_rpath_arg"; then
1421 RLD_FLAG="$enable_rpath_arg"
1422 fi
1423 else
1424 RLD_FLAG=""
1425 fi
1426 1398
1427 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) 1399 AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG])
1428 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) 1400 AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG])
1429 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) 1401 AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
1430 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT]) 1402 AC_MSG_NOTICE([defining SHLEXT to be $SHLEXT])
1443 AC_MSG_NOTICE([defining DL_LD to be $DL_LD]) 1415 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
1444 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS]) 1416 AC_MSG_NOTICE([defining DL_LDFLAGS to be $DL_LDFLAGS])
1445 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS]) 1417 AC_MSG_NOTICE([defining MKOCTFILE_DL_LDFLAGS to be $MKOCTFILE_DL_LDFLAGS])
1446 AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS]) 1418 AC_MSG_NOTICE([defining SONAME_FLAGS to be $SONAME_FLAGS])
1447 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) 1419 AC_MSG_NOTICE([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP])
1448 AC_MSG_NOTICE([defining RLD_FLAG to be $RLD_FLAG])
1449 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR]) 1420 AC_MSG_NOTICE([defining TEMPLATE_AR to be $TEMPLATE_AR])
1450 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) 1421 AC_MSG_NOTICE([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS])
1451 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS]) 1422 AC_MSG_NOTICE([defining CRUFT_DLL_DEFS to be $CRUFT_DLL_DEFS])
1452 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS]) 1423 AC_MSG_NOTICE([defining OCTAVE_DLL_DEFS to be $OCTAVE_DLL_DEFS])
1453 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS]) 1424 AC_MSG_NOTICE([defining OCTINTERP_DLL_DEFS to be $OCTINTERP_DLL_DEFS])
1472 AC_SUBST(DL_LD) 1443 AC_SUBST(DL_LD)
1473 AC_SUBST(DL_LDFLAGS) 1444 AC_SUBST(DL_LDFLAGS)
1474 AC_SUBST(MKOCTFILE_DL_LDFLAGS) 1445 AC_SUBST(MKOCTFILE_DL_LDFLAGS)
1475 AC_SUBST(SONAME_FLAGS) 1446 AC_SUBST(SONAME_FLAGS)
1476 AC_SUBST(NO_OCT_FILE_STRIP) 1447 AC_SUBST(NO_OCT_FILE_STRIP)
1477 AC_SUBST(RLD_FLAG)
1478 AC_SUBST(TEMPLATE_AR) 1448 AC_SUBST(TEMPLATE_AR)
1479 AC_SUBST(TEMPLATE_ARFLAGS) 1449 AC_SUBST(TEMPLATE_ARFLAGS)
1480 AC_SUBST(CRUFT_DLL_DEFS) 1450 AC_SUBST(CRUFT_DLL_DEFS)
1481 AC_SUBST(OCTAVE_DLL_DEFS) 1451 AC_SUBST(OCTAVE_DLL_DEFS)
1482 AC_SUBST(OCTINTERP_DLL_DEFS) 1452 AC_SUBST(OCTINTERP_DLL_DEFS)