projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regen build files
[psensor.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
e3e011d
..
3eac7db
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.
13
],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.6.2.
x
],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
@@
-54,12
+54,17
@@
AC_SUBST(XEXT_LIBS)
# Checks GTK
GTK_LIBS=
# Checks GTK
GTK_LIBS=
-PKG_CHECK_MODULES(GTK, gtk+-3.0,,[AC_MSG_WARN("GTK+ 3 not present")])
+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")
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
if test "$GTK_LIBS" == ""; then
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
if test "$GTK_LIBS" == ""; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 )
+ 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
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
fi
@@
-170,7
+175,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
"
]
)
]
)
@@
-179,7
+184,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")
@@
-221,10
+226,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