X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=73f88761326a840b945bb569d70e64a74b314985;hb=54be3e479151d0279429f7fbecd111431650c58f;hp=116c6ae8318b058161d34c4779cd1980c299726a;hpb=5cec0a1533188970d5784a4ced8b127ab2366080;p=lttv.git diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 116c6ae8..73f88761 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) #AC_WITH_LTDL # not needed ? -AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.6.2-20092005) +AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.27-05032006) AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL @@ -45,9 +45,13 @@ AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([libutil is required in order to compile LinuxTraceToolkit])) + +# pthread for lttd +AC_CHECK_LIB(pthread, pthread_join,[THREAD_LIBS="-lpthread"], AC_MSG_ERROR([LinuxThreads is required in order to compile lttd])) + # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h]) +AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h pthread.h]) AC_ISC_POSIX AC_PROG_CC @@ -79,7 +83,7 @@ AC_CHECK_FUNCS([select]) AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes) lttvlibdir="${libdir}/lttv" lttvplugindir="${lttvlibdir}/plugins" -lttlibdir="${libdir}/ltt" +#lttlibdir="${libdir}/ltt" top_lttvdir="\$(top_srcdir)/lttv" top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow" @@ -95,9 +99,10 @@ lttctlincludedir="${includedir}/liblttctl" AC_SUBST(POPT_LIBS) AC_SUBST(UTIL_LIBS) +AC_SUBST(THREAD_LIBS) AC_SUBST(lttvlibdir) AC_SUBST(lttvplugindir) -AC_SUBST(lttlibdir) +#AC_SUBST(lttlibdir) AC_SUBST(top_lttvdir) AC_SUBST(top_lttvwindowdir) AC_SUBST(DEFAULT_INCLUDES) @@ -115,6 +120,8 @@ AC_CONFIG_FILES([Makefile lttv/modules/text/Makefile lttv/modules/gui/Makefile lttv/modules/gui/lttvwindow/Makefile + lttv/modules/gui/interrupts/Makefile + lttv/modules/gui/diskperformance/Makefile lttv/modules/gui/lttvwindow/lttvwindow/Makefile lttv/modules/gui/lttvwindow/pixmaps/Makefile lttv/modules/gui/controlflow/Makefile