X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure;h=fa91b4e8ed60db0b1b235b274c4a371c1a9fff58;hb=c03992270c83b50fa316d751caf98e0662698e98;hp=6dc2a63dfc38ca2d541cc517256d305392cffa13;hpb=c7f384b35685ce49fef6d8f9a8d0ac47f5b6a91d;p=psensor.git diff --git a/configure b/configure index 6dc2a63..fa91b4e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for psensor 0.6.2.13. +# Generated by GNU Autoconf 2.68 for psensor 0.6.2.15. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='psensor' PACKAGE_TARNAME='psensor' -PACKAGE_VERSION='0.6.2.13' -PACKAGE_STRING='psensor 0.6.2.13' +PACKAGE_VERSION='0.6.2.15' +PACKAGE_STRING='psensor 0.6.2.15' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' @@ -645,6 +645,8 @@ LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS GCONF_LIBS GCONF_CFLAGS +GTK_FALSE +GTK_TRUE GTK_LIBS GTK_CFLAGS XEXT_LIBS @@ -1353,7 +1355,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures psensor 0.6.2.13 to adapt to many kinds of systems. +\`configure' configures psensor 0.6.2.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1427,7 +1429,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of psensor 0.6.2.13:";; + short | recursive ) echo "Configuration of psensor 0.6.2.15:";; esac cat <<\_ACEOF @@ -1565,7 +1567,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 0.6.2.13 +psensor configure 0.6.2.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1988,7 +1990,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by psensor $as_me 0.6.2.13, which was +It was created by psensor $as_me 0.6.2.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2805,7 +2807,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='0.6.2.13' + VERSION='0.6.2.15' cat >>confdefs.h <<_ACEOF @@ -7298,6 +7300,7 @@ fi # Checks GTK +GTK_LIBS= pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 @@ -7307,12 +7310,12 @@ if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 \""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 " 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7324,12 +7327,12 @@ if test -n "$GTK_LIBS"; then pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 \""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 " 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -7350,14 +7353,101 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 " 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 " 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 ) were not met: + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"GTK+ 3 not present\"" >&5 +$as_echo "$as_me: WARNING: \"GTK+ 3 not present\"" >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"GTK+ 3 not present\"" >&5 +$as_echo "$as_me: WARNING: \"GTK+ 3 not present\"" >&2;} +else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_GTK3 1" >>confdefs.h + +fi + if test -n "$GTK_LIBS"; then + GTK_TRUE= + GTK_FALSE='#' +else + GTK_TRUE='#' + GTK_FALSE= +fi + + + + +if test "$GTK_LIBS" == ""; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 +$as_echo_n "checking for GTK... " >&6; } + +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.18" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.18\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.18") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.18" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.18" 2>&1` + else + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.18" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gtk+-2.0 >= 2.18) were not met: $GTK_PKG_ERRORS @@ -7389,9 +7479,18 @@ else $as_echo "yes" >&6; } fi + if test -n "$GTK_LIBS"; then + GTK_TRUE= + GTK_FALSE='#' +else + GTK_TRUE='#' + GTK_FALSE= +fi +fi + # Check GCONF pkg_failed=no @@ -7580,6 +7679,84 @@ fi # Checks AppIndicator APPINDICATOR_LIBS= + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 +$as_echo_n "checking for APPINDICATOR... " >&6; } + +if test -n "$APPINDICATOR_CFLAGS"; then + pkg_cv_APPINDICATOR_CFLAGS="$APPINDICATOR_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator3-0.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$APPINDICATOR_LIBS"; then + pkg_cv_APPINDICATOR_LIBS="$APPINDICATOR_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator3-0.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator3-0.1" 2>&1` + else + APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator3-0.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$APPINDICATOR_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5 +$as_echo "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5 +$as_echo "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;} +else + APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS + APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_APPINDICATOR 1" >>confdefs.h + +fi + +if test "$APPINDICATOR_LIBS" == ""; then + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5 $as_echo_n "checking for APPINDICATOR... " >&6; } @@ -7658,6 +7835,7 @@ $as_echo "#define HAVE_APPINDICATOR_029 1" >>confdefs.h fi +fi if test "$APPINDICATOR_LIBS" == ""; then @@ -8106,7 +8284,7 @@ if test "${with_libatiadl+set}" = set; then : withval=$with_libatiadl; 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" fi @@ -8161,7 +8339,7 @@ if test "x$ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" = xyes; then : $as_echo "#define HAVE_LIBATIADL 1" >>confdefs.h 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" fi @@ -8374,7 +8552,7 @@ fi -ac_config_files="$ac_config_files Makefile src/Makefile src/glade/Makefile src/plib/Makefile src/lib/Makefile src/unity/Makefile src/libpsensor_json/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/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" +ac_config_files="$ac_config_files Makefile src/Makefile src/glade/Makefile src/lib/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/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" for ac_prog in help2man @@ -8545,6 +8723,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then + as_fn_error $? "conditional \"GTK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then + as_fn_error $? "conditional \"GTK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${LIBNOTIFY_TRUE}" && test -z "${LIBNOTIFY_FALSE}"; then as_fn_error $? "conditional \"LIBNOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -8990,7 +9176,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by psensor $as_me 0.6.2.13, which was +This file was extended by psensor $as_me 0.6.2.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9057,7 +9243,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -psensor config.status 0.6.2.13 +psensor config.status 0.6.2.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -9199,10 +9385,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;; - "src/plib/Makefile") CONFIG_FILES="$CONFIG_FILES src/plib/Makefile" ;; "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; - "src/unity/Makefile") CONFIG_FILES="$CONFIG_FILES src/unity/Makefile" ;; - "src/libpsensor_json/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpsensor_json/Makefile" ;; "src/server/Makefile") CONFIG_FILES="$CONFIG_FILES src/server/Makefile" ;; "icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/scalable/Makefile" ;; "icons/hicolor/14x14/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/14x14/Makefile" ;;