Merge branch 'master' into ppa-daily-trunk

[psensor-pkg-ubuntu.git] / config.h.in

diff --git a/config.h.in b/config.h.in
index 8f456ae..1f671a6 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -16,11 +16,11 @@
 /* Use libatasmart */
 #undef HAVE_ATASMART
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
@@ -31,9 +31,6 @@
    */
 #undef HAVE_DCGETTEXT
 
-/* Use gconf2 */
-#undef HAVE_GCONF2
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -43,7 +40,7 @@
 /* Use GTOP */
 #undef HAVE_GTOP
 
-/* Define if you have the iconv() function and it works. */
+/* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -96,8 +93,8 @@
 /* Remote monitoring enabled */
 #undef HAVE_REMOTE_SUPPORT
 
-/* Define to 1 if you have the <sensors/errors.h> header file. */
-#undef HAVE_SENSORS_ERRORS_H
+/* Define to 1 if you have the <sensors/error.h> header file. */
+#undef HAVE_SENSORS_ERROR_H
 
 /* Define to 1 if you have the <sensors/sensors.h> header file. */
 #undef HAVE_SENSORS_SENSORS_H
@@ -138,9 +135,6 @@
 /* Use Unity */
 #undef HAVE_UNITY
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
 /* Name of package */
 #undef PACKAGE