projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure only allowed gtk headers are included
[psensor.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
f79e575
..
cf4a175
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,7
+2,7
@@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.64])
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.64])
-AC_INIT([psensor], [0.
6.2.11
],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.
7.0.0
],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
@@
-52,11
+52,24
@@
PKG_CHECK_MODULES(XEXT, xext)
AC_SUBST(XEXT_CFLAGS)
AC_SUBST(XEXT_LIBS)
AC_SUBST(XEXT_CFLAGS)
AC_SUBST(XEXT_LIBS)
-# Checks GTK
-PKG_CHECK_MODULES(GTK, gtk+-2.0 )
+# Checks GTK
+GTK_LIBS=
+PKG_CHECK_MODULES(GTK,
+ gtk+-3.0,
+ [AC_DEFINE([HAVE_GTK3],[1],[Use GTK3])],
+ [AC_MSG_WARN("GTK+ 3 not present")])
+AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
+GTK_CFLAGS+=-DGTK_DISABLE_SINGLE_INCLUDES
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+if test "$GTK_LIBS" == ""; then
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+ AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+fi
+
# Check GCONF
PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS)
# Check GCONF
PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS)
@@
-64,6
+77,15
@@
AC_SUBST(GCONF_LIBS)
### Optional
### Optional
+# check libatasmart
+PKG_CHECK_MODULES(ATASMART, libatasmart,
+ [AC_DEFINE([HAVE_ATASMART],[1],[Use libatasmart])],
+ [AC_MSG_WARN("Library atasmart not present")])
+
+AM_CONDITIONAL(ATASMART, test -n "$ATASMART_LIBS")
+AC_SUBST(ATASMART_CFLAGS)
+AC_SUBST(ATASMART_LIBS)
+
# Check libnotify
LIBNOTIFY_LIBS=
PKG_CHECK_MODULES(LIBNOTIFY,
# Check libnotify
LIBNOTIFY_LIBS=
PKG_CHECK_MODULES(LIBNOTIFY,
@@
-76,12
+98,19
@@
AC_SUBST(LIBNOTIFY_LIBS)
# Checks AppIndicator
APPINDICATOR_LIBS=
# Checks AppIndicator
APPINDICATOR_LIBS=
-PKG_CHECK_MODULES(APPINDICATOR,
+
+PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
+ [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+ [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+
+if test "$APPINDICATOR_LIBS" == ""; then
+ PKG_CHECK_MODULES(APPINDICATOR,
appindicator-0.1 <= 0.2.9 ,
[AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9])
AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9])
],
[AC_MSG_WARN(AppIndicator 0.2.9 not present")])
appindicator-0.1 <= 0.2.9 ,
[AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9])
AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9])
],
[AC_MSG_WARN(AppIndicator 0.2.9 not present")])
+fi
if test "$APPINDICATOR_LIBS" == ""; then
PKG_CHECK_MODULES(APPINDICATOR,
if test "$APPINDICATOR_LIBS" == ""; then
PKG_CHECK_MODULES(APPINDICATOR,
@@
-156,7
+185,7
@@
AC_ARG_WITH(libatiadl,
[ --with-libatiadl[=DIR] use libatiadlxx in DIR],[
ATIADL_DIR=${withval}
CPPFLAGS="${CPPFLAGS} -I${ATIADL_DIR}/include"
[ --with-libatiadl[=DIR] use libatiadlxx in DIR],[
ATIADL_DIR=${withval}
CPPFLAGS="${CPPFLAGS} -I${ATIADL_DIR}/include"
- LIBS="$LIBS -L/usr/lib/fglrx"
+ LIBS="$LIBS -L/usr/lib/fglrx
-L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst
"
]
)
]
)
@@
-165,7
+194,7
@@
AC_CHECK_HEADERS(adl_defines.h,
[
AC_DEFINE(HAVE_LIBATIADL,1,[libatiadl is available])
LIBATIADL_CFLAGS="-I${ATIADL_DIR}/include"
[
AC_DEFINE(HAVE_LIBATIADL,1,[libatiadl is available])
LIBATIADL_CFLAGS="-I${ATIADL_DIR}/include"
- LIBATIADL_LIBS="-L/usr/lib/fglrx -
latiadlxx
"
+ LIBATIADL_LIBS="-L/usr/lib/fglrx -
L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst -latiadlxx -ldl
"
]))
AM_CONDITIONAL(LIBATIADL, test -n "$LIBATIADL_LIBS")
]))
AM_CONDITIONAL(LIBATIADL, test -n "$LIBATIADL_LIBS")
@@
-207,10
+236,7
@@
AC_CONFIG_FILES([
Makefile
src/Makefile
src/glade/Makefile
Makefile
src/Makefile
src/glade/Makefile
- src/plib/Makefile
src/lib/Makefile
src/lib/Makefile
- src/unity/Makefile
- src/libpsensor_json/Makefile
src/server/Makefile
icons/hicolor/scalable/Makefile
icons/hicolor/14x14/Makefile
src/server/Makefile
icons/hicolor/scalable/Makefile
icons/hicolor/14x14/Makefile
@@
-220,6
+246,9
@@
AC_CONFIG_FILES([
icons/hicolor/32x32/Makefile
icons/hicolor/48x48/Makefile
icons/hicolor/64x64/Makefile
icons/hicolor/32x32/Makefile
icons/hicolor/48x48/Makefile
icons/hicolor/64x64/Makefile
+ icons/ubuntu-mono-dark/status/22/Makefile
+ icons/ubuntu-mono-light/status/22/Makefile
+ icons/ubuntu-mono-dark/apps/22/Makefile
www/Makefile
po/Makefile.in
tests/Makefile
www/Makefile
po/Makefile.in
tests/Makefile