X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=d032e80fb956bc499c0dcc92367a87c88d3b2e23;hb=b6de13fcb155c076b2a4360ba33bc29a7fdc37ec;hp=8ca1cb374f5334db7485289a39a501923e00033e;hpb=3e903113d33c96ce5eb6306b3c3a6d6cb2dacb57;p=psensor.git

diff --git a/configure.ac b/configure.ac
index 8ca1cb3..d032e80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,12 +54,17 @@ AC_SUBST(XEXT_LIBS)
 
 # Checks GTK
 GTK_LIBS=
-PKG_CHECK_MODULES(GTK, gtk+-3.0 )
+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
    PKG_CHECK_MODULES(GTK, gtk+-2.0 )
+   AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
    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"
-	      	   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"
-			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")
@@ -221,7 +226,6 @@ AC_CONFIG_FILES([
  Makefile
  src/Makefile
  src/glade/Makefile
- src/plib/Makefile
  src/lib/Makefile
  src/unity/Makefile
  src/libpsensor_json/Makefile