Changes in / [02af79b0:db27767]
- Files:
-
- 6 edited
-
configure (modified) (4 diffs)
-
configure.ac (modified) (2 diffs)
-
libcfa/configure (modified) (1 diff)
-
libcfa/configure.ac (modified) (1 diff)
-
src/Makefile.am (modified) (1 diff)
-
src/Makefile.in (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
configure
r02af79b0 rdb27767 637 637 LIBOBJS 638 638 CFA_BACKEND_CC 639 WITH_LIBTCMALLOC_FALSE640 WITH_LIBTCMALLOC_TRUE641 WITH_LIBPROFILER_FALSE642 WITH_LIBPROFILER_TRUE643 639 WITH_LIBFIBRE_FALSE 644 640 WITH_LIBFIBRE_TRUE … … 3402 3398 "debug") ;; 3403 3399 "nolib") ;; 3404 "profile") ;;3405 3400 *) 3406 3401 >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'" … … 16662 16657 16663 16658 16664 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ProfilingIsEnabledForAllThreads in -lprofiler" >&516665 $as_echo_n "checking for ProfilingIsEnabledForAllThreads in -lprofiler... " >&6; }16666 if ${ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads+:} false; then :16667 $as_echo_n "(cached) " >&616668 else16669 ac_check_lib_save_LIBS=$LIBS16670 LIBS="-lprofiler $LIBS"16671 cat confdefs.h - <<_ACEOF >conftest.$ac_ext16672 /* end confdefs.h. */16673 16674 /* Override any GCC internal prototype to avoid an error.16675 Use char because int might match the return type of a GCC16676 builtin and then its argument prototype would still apply. */16677 #ifdef __cplusplus16678 extern "C"16679 #endif16680 char ProfilingIsEnabledForAllThreads ();16681 int16682 main ()16683 {16684 return ProfilingIsEnabledForAllThreads ();16685 ;16686 return 0;16687 }16688 _ACEOF16689 if ac_fn_c_try_link "$LINENO"; then :16690 ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads=yes16691 else16692 ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads=no16693 fi16694 rm -f core conftest.err conftest.$ac_objext \16695 conftest$ac_exeext conftest.$ac_ext16696 LIBS=$ac_check_lib_save_LIBS16697 fi16698 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" >&516699 $as_echo "$ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" >&6; }16700 if test "x$ac_cv_lib_profiler_ProfilingIsEnabledForAllThreads" = xyes; then :16701 HAVE_LIBPROFILER=116702 else16703 HAVE_LIBPROFILER=016704 fi16705 16706 if test "$HAVE_LIBPROFILER" -eq 1; then16707 WITH_LIBPROFILER_TRUE=16708 WITH_LIBPROFILER_FALSE='#'16709 else16710 WITH_LIBPROFILER_TRUE='#'16711 WITH_LIBPROFILER_FALSE=16712 fi16713 16714 16715 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&516716 $as_echo_n "checking for malloc in -ltcmalloc... " >&6; }16717 if ${ac_cv_lib_tcmalloc_malloc+:} false; then :16718 $as_echo_n "(cached) " >&616719 else16720 ac_check_lib_save_LIBS=$LIBS16721 LIBS="-ltcmalloc $LIBS"16722 cat confdefs.h - <<_ACEOF >conftest.$ac_ext16723 /* end confdefs.h. */16724 16725 /* Override any GCC internal prototype to avoid an error.16726 Use char because int might match the return type of a GCC16727 builtin and then its argument prototype would still apply. */16728 #ifdef __cplusplus16729 extern "C"16730 #endif16731 char malloc ();16732 int16733 main ()16734 {16735 return malloc ();16736 ;16737 return 0;16738 }16739 _ACEOF16740 if ac_fn_c_try_link "$LINENO"; then :16741 ac_cv_lib_tcmalloc_malloc=yes16742 else16743 ac_cv_lib_tcmalloc_malloc=no16744 fi16745 rm -f core conftest.err conftest.$ac_objext \16746 conftest$ac_exeext conftest.$ac_ext16747 LIBS=$ac_check_lib_save_LIBS16748 fi16749 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&516750 $as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }16751 if test "x$ac_cv_lib_tcmalloc_malloc" = xyes; then :16752 HAVE_LIBTCMALLOC=116753 else16754 HAVE_LIBTCMALLOC=016755 fi16756 16757 if test "$HAVE_LIBTCMALLOC" -eq 1; then16758 WITH_LIBTCMALLOC_TRUE=16759 WITH_LIBTCMALLOC_FALSE='#'16760 else16761 WITH_LIBTCMALLOC_TRUE='#'16762 WITH_LIBTCMALLOC_FALSE=16763 fi16764 16765 16766 16659 # Checks for header files. 16767 16660 for ac_header in libintl.h malloc.h unistd.h … … 16996 16889 if test -z "${WITH_LIBFIBRE_TRUE}" && test -z "${WITH_LIBFIBRE_FALSE}"; then 16997 16890 as_fn_error $? "conditional \"WITH_LIBFIBRE\" was never defined. 16998 Usually this means the macro was only invoked conditionally." "$LINENO" 516999 fi17000 if test -z "${WITH_LIBPROFILER_TRUE}" && test -z "${WITH_LIBPROFILER_FALSE}"; then17001 as_fn_error $? "conditional \"WITH_LIBPROFILER\" was never defined.17002 Usually this means the macro was only invoked conditionally." "$LINENO" 517003 fi17004 if test -z "${WITH_LIBTCMALLOC_TRUE}" && test -z "${WITH_LIBTCMALLOC_FALSE}"; then17005 as_fn_error $? "conditional \"WITH_LIBTCMALLOC\" was never defined.17006 16891 Usually this means the macro was only invoked conditionally." "$LINENO" 5 17007 16892 fi -
configure.ac
r02af79b0 rdb27767 139 139 "debug") ;; 140 140 "nolib") ;; 141 "profile") ;;142 141 *) 143 142 >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'" … … 191 190 AM_CONDITIONAL([WITH_LIBFIBRE], [test "$HAVE_LIBFIBRE" -eq 1]) 192 191 193 AC_CHECK_LIB([profiler], [ProfilingIsEnabledForAllThreads], [HAVE_LIBPROFILER=1], [HAVE_LIBPROFILER=0])194 AM_CONDITIONAL([WITH_LIBPROFILER], [test "$HAVE_LIBPROFILER" -eq 1])195 196 AC_CHECK_LIB([tcmalloc], [malloc], [HAVE_LIBTCMALLOC=1], [HAVE_LIBTCMALLOC=0])197 AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "$HAVE_LIBTCMALLOC" -eq 1])198 199 192 # Checks for header files. 200 193 AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1]) -
libcfa/configure
r02af79b0 rdb27767 2959 2959 case $CONFIGURATION in 2960 2960 "debug" ) 2961 CONFIG_CFLAGS="-O g-g"2961 CONFIG_CFLAGS="-O0 -g" 2962 2962 CONFIG_CFAFLAGS="-debug" 2963 2963 CONFIG_BUILDLIB="yes" 2964 2964 ;; 2965 2965 "nodebug" ) 2966 CONFIG_CFLAGS="-O 3-s"2966 CONFIG_CFLAGS="-O2 -s" 2967 2967 CONFIG_CFAFLAGS="-nodebug" 2968 2968 CONFIG_BUILDLIB="yes" 2969 2969 ;; 2970 2970 "nolib" ) 2971 CONFIG_CFLAGS="-O 3-s"2971 CONFIG_CFLAGS="-O2 -s" 2972 2972 CONFIG_CFAFLAGS="-nolib" 2973 2973 CONFIG_BUILDLIB="no" 2974 ;;2975 "profile" )2976 CONFIG_CFLAGS="-O3 -g -fno-omit-frame-pointer"2977 CONFIG_CFAFLAGS="-nodebug"2978 CONFIG_BUILDLIB="yes"2979 2974 ;; 2980 2975 *) -
libcfa/configure.ac
r02af79b0 rdb27767 45 45 case $CONFIGURATION in 46 46 "debug" ) 47 CONFIG_CFLAGS="-O g-g"47 CONFIG_CFLAGS="-O0 -g" 48 48 CONFIG_CFAFLAGS="-debug" 49 49 CONFIG_BUILDLIB="yes" 50 50 ;; 51 51 "nodebug" ) 52 CONFIG_CFLAGS="-O 3-s"52 CONFIG_CFLAGS="-O2 -s" 53 53 CONFIG_CFAFLAGS="-nodebug" 54 54 CONFIG_BUILDLIB="yes" 55 55 ;; 56 56 "nolib" ) 57 CONFIG_CFLAGS="-O 3-s"57 CONFIG_CFLAGS="-O2 -s" 58 58 CONFIG_CFAFLAGS="-nolib" 59 59 CONFIG_BUILDLIB="no" 60 ;;61 "profile" )62 CONFIG_CFLAGS="-O3 -g -fno-omit-frame-pointer"63 CONFIG_CFAFLAGS="-nodebug"64 CONFIG_BUILDLIB="yes"65 60 ;; 66 61 *) -
src/Makefile.am
r02af79b0 rdb27767 56 56 ___driver_cfa_cpp_LDADD = -ldl # yywrap 57 57 58 if WITH_LIBPROFILER 59 ___driver_cfa_cpp_LDADD += -lprofiler 60 endif 61 62 if WITH_LIBTCMALLOC 63 ___driver_cfa_cpp_LDADD += -ltcmalloc 64 endif 65 66 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 58 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14 67 59 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic 68 60 ARFLAGS = cr -
src/Makefile.in
r02af79b0 rdb27767 651 651 ___driver_cfa_cpp_SOURCES = $(SRC) 652 652 ___driver_cfa_cpp_LDADD = -ldl # yywrap 653 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O 3-g -std=c++14653 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14 654 654 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic 655 655 ARFLAGS = cr … … 1526 1526 @rm BasicTypes-gen 1527 1527 1528 @WITH_LIBPROFILER_TRUE@ ___driver_cfa_cpp_LDADD += -lprofiler1529 1530 @WITH_LIBTCMALLOC_TRUE@ ___driver_cfa_cpp_LDADD += -ltcmalloc1531 1532 1528 # Tell versions [3.59,3.63) of GNU make to not export all variables. 1533 1529 # Otherwise a system limit (for SysV at least) may be exceeded.
Note:
See TracChangeset
for help on using the changeset viewer.