kwo pushed a commit to branch master.
commit e00a53d3902c1b599f7a2b47cfcbded53ff0b4f4
Author: Kim Woelders <[email protected]>
Date: Fri Jul 12 09:28:30 2013 +0200
Fix optional libgtop usage.
---
configure.ac | 47 ++++++++---------------------------------------
epplets/Makefile.am | 12 ++++++------
2 files changed, 14 insertions(+), 45 deletions(-)
diff --git a/configure.ac b/configure.ac
index dbb49b8..b3ae7e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_PROG_LIBTOOL
AC_PROG_INSTALL
+PKG_PROG_PKG_CONFIG
+
dnl# Look for needed programs
AC_CHECK_PROG(RM, rm, rm, true)
AC_CHECK_PROG(CP, cp, cp, false)
@@ -81,46 +83,13 @@ PKG_CHECK_MODULES(IMLIB2, imlib2 >= 1.2.0)
AC_CHECK_LIB(kstat, kstat_open, KSTAT_LIBS="-lkstat")
AC_SUBST(KSTAT_LIBS)
-AC_MSG_CHECKING(for Linux)
-if test "`uname -s`" != "Linux"; then
- AC_MSG_RESULT(no)
- AC_CHECK_PROG(LIBGTOP_CONFIG, libgtop-config, libgtop-config, no)
-else
- AC_MSG_RESULT(yes)
- LIBGTOP_CONFIG=no
-fi
-
-if test "$LIBGTOP_CONFIG" != "no"; then
-
- LIBGTOP_CONF_SH="`$LIBGTOP_CONFIG --config`"
- if test ! -z "$LIBGTOP_CONF_SH"; then
- . $LIBGTOP_CONF_SH
-
- AC_MSG_CHECKING(libgtop-config for the value of CFLAGS)
- CFLAGS="$CFLAGS $LIBGTOP_INCS"
- AC_DEFINE(HAVE_LIBGTOP, 1, [Have libgtop])
- AC_MSG_RESULT($CFLAGS)
-
- AC_MSG_CHECKING(libgtop-config for the value of LIBS)
- GTLIBS="$GTLIBS $LIBGTOP_LIBS $LIBGTOP_EXTRA_LIBS"
- AC_MSG_RESULT($GTLIBS)
-
- SAVE_LIBS="$LIBS"
- LIBS="$GTLIBS"
-
- AC_MSG_CHECKING(the sanity of new compile/link flags)
- AC_TRY_LINK(, , echo "yes", echo "no" ; LIBGTOP_CONFIG="no" ;
- AC_WARN(Compile/link failed.)
- )
-
- LIBS="$SAVE_LIBS"
- fi
-else
- GTLIBS=""
+# Build with libgtop?
+AC_ARG_WITH(libgtop,
+ [ --with-libgtop use libgtop if available @<:@default=no@:>@])
+if test "x$with_libgtop" = "xyes"; then
+ PKG_CHECK_MODULES(LIBGTOP, libgtop-2.0,
+ AC_DEFINE(HAVE_LIBGTOP, 1, [Using libgtop]) )
fi
-AC_SUBST(GTLIBS)
-
-
# Build test programs?
AC_ARG_WITH(test-programs,
diff --git a/epplets/Makefile.am b/epplets/Makefile.am
index 5dea9f0..95624d3 100644
--- a/epplets/Makefile.am
+++ b/epplets/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_PROGRAMS = EppletTest.epplet EppletConfigTest.epplet
E-Mixer.epplet \
Emix.epplet E-PlayCD.epplet E-OpenGL-Demo.epplet \
E-SD.epplet
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/api $(IMLIB2_CFLAGS)
$(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/api $(IMLIB2_CFLAGS)
$(X_CFLAGS) $(LIBGTOP_CFLAGS)
LDADD = $(top_builddir)/api/libepplet.la $(X_LIBS) $(KSTAT_LIBS)
################ Conditional Builds ################
@@ -42,10 +42,10 @@ E_SD_epplet_SOURCES = E-SD.c esdcloak.c utils.c utils.h
esdcloak.h
E_SD_epplet_LDADD = $(LDADD) -lesd -lImlib2 -lm
E_Load_epplet_SOURCES = E-Load.c
-E_Load_epplet_LDADD = $(LDADD) $(GTLIBS)
+E_Load_epplet_LDADD = $(LDADD) $(LIBGTOP_LIBS)
E_LoadMeter_epplet_SOURCES = E-LoadMeter.c load.c
-E_LoadMeter_epplet_LDADD = $(LDADD) $(GTLIBS)
+E_LoadMeter_epplet_LDADD = $(LDADD) $(LIBGTOP_LIBS)
E_Clock_epplet_SOURCES = E-Clock.c
E_Clock_epplet_LDADD = $(LDADD) -lm
@@ -71,7 +71,7 @@ E_NetFlame_epplet_SOURCES = E-NetFlame.c net.c net.h
E_Wireless_epplet_SOURCES = E-Wireless.c
E_Cpu_epplet_SOURCES = E-Cpu.c proc.h
-E_Cpu_epplet_LDADD = $(LDADD) $(GTLIBS)
+E_Cpu_epplet_LDADD = $(LDADD) $(LIBGTOP_LIBS)
E_Power_epplet_SOURCES = E-Power.c
@@ -79,12 +79,12 @@ E_Biff_epplet_SOURCES = E-Biff.c mbox.c
E_Biff_epplet_LDADD = $(LDADD) -lX11
E_MemWatch_epplet_SOURCES = E-MemWatch.c
-E_MemWatch_epplet_LDADD = $(LDADD) $(GTLIBS)
+E_MemWatch_epplet_LDADD = $(LDADD) $(LIBGTOP_LIBS)
E_Disk_epplet_SOURCES = E-Disk.c
E_Sys_epplet_SOURCES = E-Sys.c
-E_Sys_epplet_LDADD = $(LDADD) $(GTLIBS)
+E_Sys_epplet_LDADD = $(LDADD) $(LIBGTOP_LIBS)
E_Slides_epplet_SOURCES = E-Slides.c
E_Slides_epplet_LDADD = $(LDADD) -lImlib2
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
