llvm.org GIT mirror llvm / add4c2f
Don't define LLVM_LIBDIR, it is not used anymore. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183769 91177308-0d34-0410-b5e6-96231b3b80d8 Rafael Espindola 6 years ago
8 changed file(s) with 9 addition(s) and 47 deletion(s). Raw diff Collapse all Expand all
17361736 fi
17371737 eval LLVM_PREFIX="${prefix}";
17381738 eval LLVM_BINDIR="${prefix}/bin";
1739 eval LLVM_LIBDIR="${prefix}/lib";
17401739 eval LLVM_DATADIR="${prefix}/share/llvm";
17411740 eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
17421741 eval LLVM_ETCDIR="${prefix}/etc/llvm";
17461745 LLVM_CONFIGTIME=`date`
17471746 AC_SUBST(LLVM_PREFIX)
17481747 AC_SUBST(LLVM_BINDIR)
1749 AC_SUBST(LLVM_LIBDIR)
17501748 AC_SUBST(LLVM_DATADIR)
17511749 AC_SUBST(LLVM_DOCSDIR)
17521750 AC_SUBST(LLVM_ETCDIR)
17661764 [Installation prefix directory])
17671765 AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR",
17681766 [Installation directory for binary executables])
1769 AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
1770 [Installation directory for libraries])
17711767 AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR",
17721768 [Installation directory for data files])
17731769 AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR",
18271823 AC_SUBST(OCAML_LIBDIR,$ocaml_stdlib)
18281824 else
18291825 # ocaml stdlib is outside our prefix; use libdir/ocaml
1830 AC_SUBST(OCAML_LIBDIR,$LLVM_LIBDIR/ocaml)
1826 AC_SUBST(OCAML_LIBDIR,${prefix}/lib/ocaml)
18311827 fi
18321828 fi
18331829 ;;
785785 SHLIBPATH_VAR
786786 LLVM_PREFIX
787787 LLVM_BINDIR
788 LLVM_LIBDIR
789788 LLVM_DATADIR
790789 LLVM_DOCSDIR
791790 LLVM_ETCDIR
1053610535 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1053710536 lt_status=$lt_dlunknown
1053810537 cat > conftest.$ac_ext <
10539 #line 10540 "configure"
10538 #line 10539 "configure"
1054010539 #include "confdefs.h"
1054110540
1054210541 #if HAVE_DLFCN_H
2230722306 fi
2230822307 eval LLVM_PREFIX="${prefix}";
2230922308 eval LLVM_BINDIR="${prefix}/bin";
22310 eval LLVM_LIBDIR="${prefix}/lib";
2231122309 eval LLVM_DATADIR="${prefix}/share/llvm";
2231222310 eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
2231322311 eval LLVM_ETCDIR="${prefix}/etc/llvm";
2232522323
2232622324
2232722325
22328
2232922326 if test "${ENABLE_TIMESTAMPS}" = "0"; then
2233022327 LLVM_CONFIGTIME="(timestamp not enabled)"
2233122328 fi
2233822335
2233922336 cat >>confdefs.h <<_ACEOF
2234022337 #define LLVM_BINDIR "$LLVM_BINDIR"
22341 _ACEOF
22342
22343
22344 cat >>confdefs.h <<_ACEOF
22345 #define LLVM_LIBDIR "$LLVM_LIBDIR"
2234622338 _ACEOF
2234722339
2234822340
2243322425
2243422426 else
2243522427 # ocaml stdlib is outside our prefix; use libdir/ocaml
22436 OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
22428 OCAML_LIBDIR=${prefix}/lib/ocaml
2243722429
2243822430 fi
2243922431 fi
2351723509 SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
2351823510 LLVM_PREFIX!$LLVM_PREFIX$ac_delim
2351923511 LLVM_BINDIR!$LLVM_BINDIR$ac_delim
23520 LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
2352123512 LLVM_DATADIR!$LLVM_DATADIR$ac_delim
2352223513 LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
2352323514 LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
2352723518 LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
2352823519 BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
2352923520 ALL_BINDINGS!$ALL_BINDINGS$ac_delim
23521 OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
2353023522 _ACEOF
2353123523
2353223524 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2356823560 ac_delim='%!_!# '
2356923561 for ac_last_try in false false false false false :; do
2357023562 cat >conf$$subs.sed <<_ACEOF
23571 OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
2357223563 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
2357323564 RPATH!$RPATH$ac_delim
2357423565 RDYNAMIC!$RDYNAMIC$ac_delim
2357723568 LTLIBOBJS!$LTLIBOBJS$ac_delim
2357823569 _ACEOF
2357923570
23580 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
23571 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
2358123572 break
2358223573 elif $ac_last_try; then
2358323574 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
596596 /* Installation directory for .info files */
597597 #cmakedefine LLVM_INFODIR "${LLVM_INFODIR}"
598598
599 /* Installation directory for libraries */
600 #cmakedefine LLVM_LIBDIR "${LLVM_LIBDIR}"
601
602599 /* Installation directory for man pages */
603600 #cmakedefine LLVM_MANDIR "${LLVM_MANDIR}"
604601
601601 /* Installation directory for .info files */
602602 #undef LLVM_INFODIR
603603
604 /* Installation directory for libraries */
605 #undef LLVM_LIBDIR
606
607604 /* Installation directory for man pages */
608605 #undef LLVM_MANDIR
609606
4747
4848 /* Installation directory for .info files */
4949 #cmakedefine LLVM_INFODIR "${LLVM_INFODIR}"
50
51 /* Installation directory for libraries */
52 #cmakedefine LLVM_LIBDIR "${LLVM_LIBDIR}"
5350
5451 /* Installation directory for man pages */
5552 #cmakedefine LLVM_MANDIR "${LLVM_MANDIR}"
4747
4848 /* Installation directory for .info files */
4949 #undef LLVM_INFODIR
50
51 /* Installation directory for libraries */
52 #undef LLVM_LIBDIR
5350
5451 /* Installation directory for man pages */
5552 #undef LLVM_MANDIR
13641364 fi
13651365 eval LLVM_PREFIX="${prefix}";
13661366 eval LLVM_BINDIR="${prefix}/bin";
1367 eval LLVM_LIBDIR="${prefix}/lib";
13681367 eval LLVM_DATADIR="${prefix}/share/llvm";
13691368 eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
13701369 eval LLVM_ETCDIR="${prefix}/etc/llvm";
13741373 LLVM_CONFIGTIME=`date`
13751374 AC_SUBST(LLVM_PREFIX)
13761375 AC_SUBST(LLVM_BINDIR)
1377 AC_SUBST(LLVM_LIBDIR)
13781376 AC_SUBST(LLVM_DATADIR)
13791377 AC_SUBST(LLVM_DOCSDIR)
13801378 AC_SUBST(LLVM_ETCDIR)
13891387 [Installation prefix directory])
13901388 AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR",
13911389 [Installation directory for binary executables])
1392 AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
1393 [Installation directory for libraries])
13941390 AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR",
13951391 [Installation directory for data files])
13961392 AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR",
14481444 AC_SUBST(OCAML_LIBDIR,$ocaml_stdlib)
14491445 else
14501446 # ocaml stdlib is outside our prefix; use libdir/ocaml
1451 AC_SUBST(OCAML_LIBDIR,$LLVM_LIBDIR/ocaml)
1447 AC_SUBST(OCAML_LIBDIR,${prefix}/lib/ocaml)
14521448 fi
14531449 fi
14541450 ;;
771771 SHLIBPATH_VAR
772772 LLVM_PREFIX
773773 LLVM_BINDIR
774 LLVM_LIBDIR
775774 LLVM_DATADIR
776775 LLVM_DOCSDIR
777776 LLVM_ETCDIR
1036210361 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1036310362 lt_status=$lt_dlunknown
1036410363 cat > conftest.$ac_ext <
10365 #line 10366 "configure"
10364 #line 10365 "configure"
1036610365 #include "confdefs.h"
1036710366
1036810367 #if HAVE_DLFCN_H
2070120700 fi
2070220701 eval LLVM_PREFIX="${prefix}";
2070320702 eval LLVM_BINDIR="${prefix}/bin";
20704 eval LLVM_LIBDIR="${prefix}/lib";
2070520703 eval LLVM_DATADIR="${prefix}/share/llvm";
2070620704 eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
2070720705 eval LLVM_ETCDIR="${prefix}/etc/llvm";
2071920717
2072020718
2072120719
20722
2072320720 # Place the various directores into the config.h file as #defines so that we
2072420721 # can know about the installation paths within LLVM.
2072520722
2073020727
2073120728 cat >>confdefs.h <<_ACEOF
2073220729 #define LLVM_BINDIR "$LLVM_BINDIR"
20733 _ACEOF
20734
20735
20736 cat >>confdefs.h <<_ACEOF
20737 #define LLVM_LIBDIR "$LLVM_LIBDIR"
2073820730 _ACEOF
2073920731
2074020732
2082420816
2082520817 else
2082620818 # ocaml stdlib is outside our prefix; use libdir/ocaml
20827 OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
20819 OCAML_LIBDIR=${prefix}/lib/ocaml
2082820820
2082920821 fi
2083020822 fi
2182521817 SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
2182621818 LLVM_PREFIX!$LLVM_PREFIX$ac_delim
2182721819 LLVM_BINDIR!$LLVM_BINDIR$ac_delim
21828 LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
2182921820 LLVM_DATADIR!$LLVM_DATADIR$ac_delim
2183021821 LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
2183121822 LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
2184321834 LTLIBOBJS!$LTLIBOBJS$ac_delim
2184421835 _ACEOF
2184521836
21846 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
21837 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
2184721838 break
2184821839 elif $ac_last_try; then
2184921840 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5