Tagging 0.8.2:

Fixed gsmartcontrol_root.sh script to support distributions with no /usr/sbin in their users' paths (thanks to Erwan Velu). Added desktop auto-detection to gsmartcontrol_root.sh script. This allows us to use only one desktop file (thanks to Erwan Velu). Added debian package directory (named "debian.dist" for now to avoid control file conflicts with Build Service). Renamed gsmartcontrol_root.sh to gsmartcontrol-root, to make Debian happy. Added make targets for Windows packages (zip and NSIS). Fixed Windows-related issues (Vista is fully supported now). Fixed minor bugs: Smartctl parser is win32-locale-aware now. No more unnecessary parsing. No segfault on exit under Windows and Solaris. A friendlier message is displayed if smartctl was not found. No hilighted labels when switching tabs in Information window.
Tagging 0.8.2.
2026-09-27 06:15:45 +00:00 · 2010-12-26 19:34:23 +00:00 · 2010-12-26 19:33:25 +00:00 · 2010-12-26 19:24:29 +00:00 · 2010-12-26 18:54:11 +00:00 · 2010-12-26 18:49:40 +00:00
306 changed files with 6514 additions and 247943 deletions
@@ -10,3 +10,7 @@ aclocal.m4
 config.h.in
 missing
 install-sh
+*.glade.cpp
+*.ui.cpp
+*.txt.cpp
+gsmartcontrol.spec
@@ -0,0 +1 @@
+See the NEWS file.
@@ -18,12 +18,18 @@ If not, see <http://www.gnu.org/licenses/>.
 See LICENSE_gpl2.txt and LICENSE_gpl3.txt for details.


+All files which don't have any copyright notices, tests and examples are
+covered under the Whatever License. See LICENSE_whatever.txt for details.
+
+
 Portions of this software are copyright Google Inc. See LICENSE_pcrecpp.txt
 for details.

+
 This product includes the HZ library (or portions of it). See LICENSE_hz.txt
 for details.

+
 This product includes icons from Crystal Project,
 copyright 2006-2007 Everaldo Coelho.
 http://www.everaldo.com/crystal, http://www.yellowicon.com .
@@ -4,21 +4,33 @@ HZ Library License
 The HZ library contains software licensed under several different licenses.
 This is due to HZ including portions of other software.

-All original code is licensed under the Zlib License. See LICENSE_zlib.txt for
-details.

-Portions of this software are copyright Regents of the University of California,
-see LICENSE_bsd-ucb.txt for details.
+All original code (except for the tests) is licensed under the Zlib License.
+See LICENSE_zlib.txt for details.
+
+
+All tests and examples are covered under the Whatever License. See
+LICENSE_whatever.txt for details.
+
+
+Portions of this software are copyright Regents of the University of
+California, see LICENSE_bsd-ucb.txt for details.
+

 Portions of this software are licensed under Boost Software License, see
 LICENSE_boost_1_0.txt and individual source files for copyright information.

+
 Each source file contains its copyright information.

 If you intend to use HZ in your product, please note that you MUST include
 these licenses somewhere in your distribution (simply redistributing the
-license files or reproducing their texts in documentation and/or other supplied
-materials is OK):
+license files or reproducing their texts in documentation and/or other
+supplied materials is OK):
 * LICENSE_zlib.txt (source distributions only);
 * LICENSE_bsd-ucb.txt (source and binary distributions);
 * LICENSE_boost_1_0.txt (source distributions only).
+
+If you use only portions of HZ, you may ignore this requirement for files you
+don't use. For example, if you don't use any of the Boost-licensed files, you
+are not required to distribute the Boost license.
@@ -0,0 +1,12 @@
+Whatever License
+
+THIS SOFTWARE IS PROVIDED 'AS-IS', WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTY.  IN NO EVENT WILL THE AUTHORS BE HELD LIABLE FOR ANY DAMAGES
+ARISING FROM THE USE OF THIS SOFTWARE.
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely.
@@ -0,0 +1,128 @@
+
+# Add autoconf.m4 directory to local macro search path
+ACLOCAL_AMFLAGS = -I autoconf.m4
+
+SUBDIRS = data debian.dist src
+
+
+# These files are actually needed for compilation.
+noinst_DATA = AUTHORS.txt LICENSE_gsmartcontrol.txt README.txt
+
+
+# For the files to be bundled with the distribution, specify them in
+# one of the following.
+
+# These will be installed into docdir.
+# Some of these files are actually needed for compilation (see src/res/Makefile.am).
+dist_doc_DATA = AUTHORS.txt ChangeLog NEWS README.txt \
+	LICENSE_boost_1_0.txt \
+	LICENSE_bsd-ucb.txt \
+	LICENSE_gpl2.txt \
+	LICENSE_gpl3.txt \
+	LICENSE_gsmartcontrol.txt \
+	LICENSE_hz.txt \
+	LICENSE_pcrecpp.txt \
+	LICENSE_whatever.txt \
+	LICENSE_zlib.txt
+
+
+# Extra files bundled with distribution.
+# file2csource.sh is needed for building but not installed.
+EXTRA_DIST = COPYING TODO INSTALL configure autogen.sh \
+	baqup gsmartcontrol.kdevelop \
+	templates \
+	file2csource.sh \
+	gsmartcontrol.spec
+
+
+
+# PCH support
+
+global_macros.h.gch: $(top_srcdir)/src/global_macros.h
+	$(CXX) $(CXXFLAGS) $(DEFS) -x "c++-header" $(top_srcdir)/src/global_macros.h -o global_macros.h.gch
+
+gch: global_macros.h.gch
+
+gch-clean:
+	rm -f global_macros.h.gch
+
+
+
+# rpm support
+
+src-rpm: dist
+	rpmbuild -ts $(distdir).tar.bz2
+
+
+# Don't use this - it does something weird, and gcc errors out with "long long long" errors, etc...
+#rpm: dist
+#	rpmbuild -ta $(distdir).tar.bz2
+
+
+
+# NSIS installer support.
+# Requires wine, installed NSIS, gtkmm dlls, pcre dlls, smartctl.exe, smartctl_console.exe.
+# dos2unix on build machine.
+# Execute only with win32 build present.
+
+WIN_ZIP_NAME = $(PACKAGE)-$(VERSION)-win32
+
+win-dist: win-dist-prepare nsis-dist-nocleanup win-zip-dist
+
+win-dist-clean:
+	rm -rf gsmartcontrol-*.exe gsmartcontrol-*.zip nsis-dist $(WIN_ZIP_NAME)
+
+
+win-dist-prepare: all win-dist-clean
+	$(MKDIR_P) nsis-dist
+
+	cp data/nsis/gsmartcontrol.nsi $(top_srcdir)/data/nsis/nsi_* nsis-dist/
+	cp $(top_srcdir)/data/gsmartcontrol.ico $(top_srcdir)/data/icon_*.png nsis-dist/
+
+	$(MKDIR_P) nsis-dist/doc
+	cp data/nsis/distribution.txt nsis-dist/doc/
+	cp $(top_srcdir)/AUTHORS.txt $(top_srcdir)/LICENSE_* $(top_srcdir)/README.txt nsis-dist/doc/
+	cp $(top_srcdir)/NEWS nsis-dist/doc/NEWS.txt
+
+	unix2dos nsis-dist/*.nsi nsis-dist/doc/*.txt
+
+	cp "@WIN32_ENV@"/libatkmm-*.dll "@WIN32_ENV@"/libcairomm-*.dll "@WIN32_ENV@"/libgdkmm-*.dll nsis-dist/
+	cp "@WIN32_ENV@"/libgiomm-*.dll "@WIN32_ENV@"/libglibmm-*.dll "@WIN32_ENV@"/libgtkmm-*.dll nsis-dist/
+	cp "@WIN32_ENV@"/libpangomm-*.dll "@WIN32_ENV@"/libsigc-*.dll "@WIN32_ENV@"/pcre3.dll nsis-dist/
+	cp "@WIN32_ENV@"/mingwm10.dll "@WIN32_ENV@"/smartctl.exe "@WIN32_ENV@"/smartctl_console.exe nsis-dist/
+
+	cp src/gsmartcontrol.exe nsis-dist/
+
+	$(STRIP) nsis-dist/*.exe
+	mv nsis-dist/mingwm10.dll nsis-dist/mingwm10.dll_
+	$(STRIP) --strip-debug --strip-unneeded nsis-dist/*.dll
+	mv nsis-dist/mingwm10.dll_ nsis-dist/mingwm10.dll
+
+
+nsis-dist: nsis-dist-nocleanup nsis-cleanup
+
+nsis-dist-nocleanup: win-dist-prepare
+	cd nsis-dist && @NSIS_EXEC@ gsmartcontrol.nsi
+	mv nsis-dist/$(PACKAGE)-$(VERSION).exe .
+
+nsis-cleanup:
+	rm -rf nsis-dist
+
+
+win-zip-dist: win-zip-dist-nocleanup win-zip-dist-cleanup
+
+win-zip-dist-nocleanup: win-dist-prepare
+	mv nsis-dist $(WIN_ZIP_NAME)
+	rm -rf $(WIN_ZIP_NAME)/gsmartcontrol.ico $(WIN_ZIP_NAME)/nsi_* $(WIN_ZIP_NAME)/*.nsi
+	zip -9r $(WIN_ZIP_NAME).zip $(WIN_ZIP_NAME)
+
+win-zip-dist-cleanup:
+	rm -rf $(WIN_ZIP_NAME)
+
+
+
+
+distclean-local: gch-clean win-dist-clean
+
+
+
@@ -0,0 +1,58 @@
+
+Version 0.8.2, released on 2008-12-10
+	Fixed gsmartcontrol_root.sh script to support distributions with no
+		/usr/sbin in their users' paths (thanks to Erwan Velu).
+	Added desktop auto-detection to gsmartcontrol_root.sh script. This allows
+		us to use only one desktop file (thanks to Erwan Velu).
+	Added debian package directory (named "debian.dist" for now to avoid
+		control file conflicts with Build Service).
+	Renamed gsmartcontrol_root.sh to gsmartcontrol-root, to make Debian happy.
+	Added make targets for Windows packages (zip and NSIS).
+	Fixed Windows-related issues (Vista is fully supported now).
+	Fixed minor bugs:
+		Smartctl parser is win32-locale-aware now.
+		No more unnecessary parsing.
+		No segfault on exit under Windows and Solaris.
+		A friendlier message is displayed if smartctl was not found.
+		No hilighted labels when switching tabs in Information window.
+
+Version 0.8.1, released on 2008-11-11
+	Disabled Linux "by-id" drive detection - it's unreliable on some broken
+		systems.
+	Added some more attribute descriptions.
+	Our names for attributes override smartctls' now.
+	Added a proper "Add Device" dialog for Windows.
+	Added an icon and resource file for Windows.
+	Fixed minor bugs.
+
+Version 0.8.0rc4, released on 2008-10-20
+	FreeBSD support (tested with DesktopBSD 1.6 (FreeBSD 6.3) / x86).
+	NetBSD support (tested with NetBSD 4.0.1 / x86).
+	OpenBSD support (tested with OpenBSD 4.3 / x86-64 / gcc-3.3.5).
+	Solaris/gcc support (tested with Solaris 10 / x86 / gcc-3.4.3 / blastwave).
+	Solaris/sunstudio support (tested with Solaris 10 / x86 / sunstudio12 /
+		sunfreeware).
+	Code to support Windows, Mac OS X, QNX.
+	Support of older pcre versions (at least 4.5, maybe older too).
+	Added gsmartcontrol_root.sh script to easily run gsmartcontrol as root.
+	Improved .desktop files.
+	License for tests and examples is legally more correct now.
+	Minor bugfixes.
+
+Version 0.8.0rc3, released on 2008-10-08
+	Added support for udevless Linux distributions by providing a fallback
+		/proc/partitions-based drive detection method. The new method adds
+		support for Linux 2.4 and older systems. Thanks to Paul Marwick for
+		reporting and testing.
+	Fixed invalid error messages with directory-related operations.
+	Fixed invalid verbosity levels of console output of debug messages in
+		non-debug builds.
+	Improved rpm spec file - now supports building on OpenSUSE build
+		service with various distributions as targets.
+
+Version 0.8.0rc2, released on 2008-10-05
+	Fixed compilation under gcc 4.3. Thanks to Peter Linnell for reporting.
+	Removed test data (there's a lot of it and it's unnecessary).
+
+Version 0.8.0rc1, released on 2008-10-01
+	Initial public release.
@@ -12,6 +12,8 @@ it.

 Note: Only ATA drives (both PATA and SATA) are supported for now.

+http://gsmartcontrol.berlios.de
+


 Features
@@ -33,6 +35,8 @@ Perform SMART self-tests.
 Ability to load smartctl output as a "virtual" device, which acts just like a
 real (read-only) device.

+Works on most smartctl-supported operating systems.
+
 Extensive help information.


@@ -56,7 +60,7 @@ the drive is idle, and repair the defects, reallocating the data to more safe
 areas.

 While having SMART sounds really good, there are some nuances to consider. One
-of the commond pitfalls is that it may create a false sense of security. That
+of the common pitfalls is that it may create a false sense of security. That
 is, a perfectly good SMART data is NOT an indication that the drive won't fail
 the next minute. The reverse is also true - some drives may function perfectly
 even with not-so-good-looking SMART data. However, as studies indicate, given
@@ -84,8 +88,6 @@ these bugs and works around them.

 Software Requirements

-So far, only Linux 2.6 systems are supported.
-
 You need to have the following software installed:

 * pcre - http://www.pcre.org .
@@ -97,16 +99,60 @@ You need to have the following software installed:
 * Gtkmm, version 2.6 or higher - see http://www.gtkmm.org .

 * libglademm, version 2.4 or higher - see http://www.gtkmm.org .
-libglademm is not needed when using GTK 2.12 and Gtkmm 2.12.
+Note: libglademm is not needed when using GTK 2.12 and Gtkmm 2.12.

 Note that GTK+ 2.12 and Gtkmm 2.12 are HIGHLY recommended. While earlier
-versions may work, they may produce ugly results and buggy behaviour.
+versions may work, they may produce suboptimal results and buggy behaviour.
 Libglademm is not needed when using GTK / Gtkmm 2.12.

-Most of these packages are probably already provided by your distribution. For
-example, to build this program on OpenSUSE, you just need to install
-smartmontools, gtkmm2-devel and pcre-devel - the rest is installed
-automatically by the package manager's dependency resolver.
+Most of these packages are probably already provided by your distribution.
+Here are the packages you need to have to build GSmartControl on some Linux
+distributions:
+
+OpenSUSE, SLES, SLED:
+gcc-c++, pcre-devel, gtkmm2-devel, (possibly) libglademm-devel.
+
+Fedora, CentOS, RHEL:
+gcc-c++, pcre-devel, gtkmm24-devel, (possibly) libglademm24-devel.
+
+Mandriva:
+gcc-c++, gcc-cpp, libpcre-devel, gtkmm2.4-devel, (possibly)
+libglademm2.4-devel.
+
+Ubuntu, Debian GNU/Linux:
+g++, libpcre3-dev, libgtkmm-2.4-dev, (possibly) libglademm-2.4-dev.
+
+Note that usually you need to specify only these packages - the rest is
+installed automatically by the package manager's dependency resolver. Keep in
+mind that you also need smartmontools to run the program.
+
+
+The following operating systems are supported:
+
+* Linux - All the popular configurations should work.
+
+* FreeBSD - Tested with DesktopBSD 1.6 (FreeBSD 6.3) / x86.
+
+* NetBSD - Tested with NetBSD 4.0.1 / x86.
+
+* OpenBSD - Tested with OpenBSD 4.3 / x86-64 / gcc-3.3.5.
+
+* Windows (XP or higher) - Tested with Windows XP and Vista. Windows 2000 does
+not work for some unknown reason. The Windows port uses pd0, pd1, etc... for
+physical drives 0, 1, etc... .
+
+* Solaris - Tested with Solaris 10 / x86 / gcc-3.4.3 / blastwave,
+Solaris 10 / x86 / sunstudio12 / sunfreeware. OpenSolaris should work but has
+not been tested yet. Note that until either smartctl gets ATA support under
+Solaris or GSmartControl gets SCSI support, these configurations are
+essentially useless.
+
+* Mac OS X - 3rd-party testing by Fink project.
+
+* DragonFlyBSD - Code written but no testing has been performed yet. Expected
+to work without any issues.
+
+* QNX - Code written but no testing has been performed yet.



@@ -118,22 +164,26 @@ Long answer: read below.

 First, check if you can find a pre-built package for your distribution or
 operating system - they usually provide the best integration and the easiest
-installation procedure.
+installation procedure. For Linux, one option is to try the OpenSUSE Build
+Service - it provides ready-to-install packages for various popular Linux
+distributions (OpenSUSE, Fedora, etc...). See
+http://download.opensuse.org/repositories/home:/alex_sh/ .

 If you want to compile from source, check that you have all the required
 dependencies (see Software Requirements section). Then the usual

 ./configure; make; make install

-will build and install it. Installation usually requires root privileges, but
-you don't need to install the program in order to run it directly from the
-compilation directory.
+will build and install it. Installation usually requires adminstrative
+privileges, but you don't need to install the program in order to run it
+directly from the compilation directory.



 Permission Problems

-Short answer: you need to be root. In X11, use kdesu, gnomesu, sux or similar.
+Short answer: you need to be root (Administrator in Windows).
+In X11, use kdesu, gnomesu, sux, xdg-su or similar.

 Long answer: read below.

@@ -141,29 +191,25 @@ Most operating systems prohibit direct access to hardware to users with
 non-administrative privileges. Unfortunately, to access SMART data, smartctl
 needs to directly access the hard drive.

-The provided desktop and menu icons should show the "Please enter the root
+The provided X11 desktop and menu icons should show the "Please enter the root
 password" dialog boxes, and, after correct information is entered, should run
 this program with root privileges. The dialogs should be available in most
 commonly used X11 desktop environments.

-However, in case the described method is somehow inaccessible, you need to
-manually invoke the program with kdesu, gnomesu, sux or similar programs. For
-example,
+Another way is to use the included gsmartcontrol-root script, which finds the
+available su program and runs gsmartcontrol with it.
+
+Yet another way is to manually invoke the program with kdesu, gnomesu, sux or
+similar programs. For example,

 kdesu -u root -c gsmartcontrol

 will ask for root password and run gsmartcontrol with root privileges. Replace
-"kdesu" with "gnomesu" if using Gnome. The "sux" command may also help, if
-neither KDE or GNOME are available.
+"kdesu" with "gnomesu" if using Gnome. The "sux" or "xdg-su" commands may also
+help, if neither KDE or GNOME are available.

-Another method would be to set the "setuid" flag on smartctl binary, for
-example (run as root):
-
-chmod 4755 `which smartctl`
-
-This method is not recommended, however, and is considered a security risk.
-Also, some systems may reset the change automatically, unless explicitly
-instructed otherwise.
+Please don't set the "setuid" flag on smartctl binary. It is considered a
+security risk.



@@ -205,7 +251,7 @@ have X11 / Gtkmm running, so this is a low priority task.
 * I only have ATA drives, so testing would be almost impossible.

 Immediate Offline Tests are not supported. I haven't found a way to reliably
-monitor them.
+monitor them yet.

 You may run several tests on different drives in parallel, but you will only
 see the progress information of the last executing test. So, if you run tests
@@ -229,19 +275,33 @@ language and all.

 Reporting Bugs

-First, please collect the following information about your system. Without it
-it may be very hard or impossible to fix the bug.
+If it is a SMART or drive-related problem, please try to test it with smartctl
+first. Chances are, the problem you're experiencing is not tied to
+GSmartControl, but is a drive firmware or smartctl problem. For example, to
+see a complete information about your /dev/sda drive, type the following in a
+terminal emulator (e.g., xterm, konsole or gnome-terminal):
+
+smartctl -a /dev/sda
+
+If you still think it's a GSmartControl issue, please collect the following
+information about your system. Without it, it may be very hard or impossible
+to fix the bug.

 * Which operating system you use (for example, OpenSUSE Linux 11.0).

-* What version of GTK and Gtkmm you have installed. Finding this out is very
+* Which version of GTK and Gtkmm you have installed. Finding this out is very
 distribution-specific. For example, on OpenSUSE it would be
 "rpm -q gtk2 gtkmm2". Some distributions have gtkmm24 instead. You may also
 search them in your distribution's graphical package manager, if there is one.

-* Execution log from the program, if possible. To obtain it, perform the steps
-needed to reproduce the bug, then go to "Options -> View Execution Log", and
-press "Save All".
+* Execution log from the program, if possible. To obtain it, run the program
+with -v option, e.g. (type the following in a terminal emulator or Run
+dialog):
+
+gsmartcontrol-root auto -v
+
+Perform the steps needed to reproduce the bug, then go to
+"Options -> View Execution Log", and click "Save All".

 * Detailed description of steps you performed when the bug occurred.

@@ -16,44 +16,47 @@ local scope destruction also works if using stack variables.


 A treeview (also iconview, combobox) from glade comes
-with existing model, which should be unset
+with existing model, which should be unset.


 --------------------------------------------------------

-GTKMM problems:
+portability:
+win32 32-bit: int: 4, long: 4, pointer: 4.
+win32 64-bit: int: 4, long: 8, pointer: 8.

-no pango_parse_markup:
-	gchar* no_markup = 0;
-	if (pango_parse_markup(markup_string, -1, 0, NULL, &no_markup, NULL, NULL)) {
-		// use no_markup
-		g_free(no_markup);
-	}
-
-
-Lots of gtk_, GTK_, g_ in documentation.
-
-
-no unset_model() on combobox and iconview.
+sparc: same as win32 (what about OS?).



 --------------------------------------------------------

 TODO:
-	if -q is passed, Execution log doesn't contain libdebug log. fix.


-Drive detection - any cross-platform way to do it?
+Patch pangomm for Pango::strip_markup().

+Make a test case of IconView positioning bug, file a bug report.
+
+Patch gtkmm, glibmm, pangomm for static win32 builds.
+
+
+libdebug:
+	per-channel disabling.
+	per-channel formatting.
+	all flags should be per-channel.
+	bug: if -q is passed, Execution log doesn't contain libdebug log. (requires per-channel status control).
+
+
+OpenSuse Build Service:
+	fails with error when tarball already contains the debian directory.




 ----------- Feature List ----------

-+Autodetect available devices (through /proc / /sys ?).
-	win32 support for autodetection (what about different smartctl drivers?).
+Autodetect available devices

 +Select current device (from autodetected list; manually whitelist devices).

@@ -100,7 +103,7 @@ SCT Temperatures (do we use these?)
 		This configures temperature logging interval (1 min by default) and clears the history.


-Tests:
+Tests:
 	Ability to detect a testing drive on boot, show its info with testing tab.

 	Run one-time Immediate Offline test (-t offline).
@@ -0,0 +1,34 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# APP_AUTO_CLEAR_FLAGS()
+# Clear user-specified CFLAGS / CXXFLAGS / LIBS / LDFLAGS if requested.
+
+# You should call this macro before any of AC_PROG_C(XX) checks to
+# avoid checking with user-specified options.
+
+AC_DEFUN([APP_AUTO_CLEAR_FLAGS], [
+
+	AC_ARG_ENABLE(user-flags, AS_HELP_STRING([--disable-user-flags],
+			[ignore user-supplied compiler flags (default: user flags are enabled)]),
+		[app_cv_compiler_user_flags=${enableval}], [app_cv_compiler_user_flags=yes])
+
+	AC_MSG_NOTICE([Enable user-specified compiler flags: $app_cv_compiler_user_flags])
+
+	# Reset user-supplied flags if requested.
+	if test "x$app_cv_compiler_user_flags" = "xno"; then
+		CFLAGS="";
+		CXXFLAGS="";
+		LIBS="";
+		LDFLAGS="";
+	fi
+
+])
+
+
+
@@ -0,0 +1,141 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# APP_CHOOSE_GLD_READER([C|C++][, flags_prefix])
+# This macro detects whether GtkBuilder (from gtk >= 2.12) or libglade
+# are present. If the first parameter is C++, then gtkmm and libglademm
+# are searched for instead.
+# flags_prefixCFLAGS, flags_prefixCXXFLAGS and flags_prefixLIBS
+# will be initialized (or appended to) with the correct flags in case of libglade(mm).
+# app_cv_gld_reader will be set to none, libglade or gtkbuilder.
+
+# ENABLE_LIBGLADE or ENABLE_GTKBUILDER will be exported to config.h
+
+# You must call AX_COMPILER_VENDOR before using this macro.
+
+AC_DEFUN([APP_CHOOSE_GLD_READER], [
+	# These requirements check compile-time presence, not that they were called
+	AC_REQUIRE([AX_COMPILER_VENDOR])
+
+	# This is just in case
+	# PKG_PROG_PKG_CONFIG()
+
+	# this variable will have values "none", "libglade" or "gtkbuilder".
+	app_cv_gld_reader="none";
+
+	# in case libglade(mm) is found, these will contain the flags.
+	app_cv_gld_reader_CFLAGS="";
+	app_cv_gld_reader_CXXFLAGS="";
+	app_cv_gld_reader_LIBS="";
+
+	app_cv_gld_reader_libglade_name="libglade";
+	app_cv_gld_reader_libglade_pkg_name="libglade-2.0";
+	app_cv_gld_reader_gtk_name="gtk";
+	app_cv_gld_reader_gtk_pkg_name="gtk+-2.0";
+	if test "x$1" = "xC++"; then
+		app_cv_gld_reader_libglade_name="libglademm";
+		app_cv_gld_reader_libglade_pkg_name="libglademm-2.4";
+		app_cv_gld_reader_gtk_name="gtkmm";
+		app_cv_gld_reader_gtk_pkg_name="gtkmm-2.4";
+	fi
+
+
+	# Manual control. AC_ARG_ENABLE doesn't get bash variables, so we have
+	# to do it this way. If put inside a shell conditional, it still shows up in configure help.
+
+	AC_ARG_ENABLE(libglade, AS_HELP_STRING([--enable-libglade],
+			[use libglade(mm) instead of GtkBuilder (default: auto)]),
+			[with_libglade=${enableval}], [with_libglade=auto])
+
+
+	# Try gtkbuilder first
+	if test "x$with_libglade" = "xno" || test "x$with_libglade" = "xauto"; then
+		PKG_CHECK_EXISTS([$app_cv_gld_reader_gtk_pkg_name >= 2.12.0],
+				[app_cv_gld_reader="gtkbuilder"])
+	fi
+	if test "$with_libglade" = "no" && test "$app_cv_gld_reader" = "none"; then
+		AC_MSG_ERROR([GtkBuilder support not found (you need $app_cv_gld_reader_gtk_name version 2.12 or higher). Try using $app_cv_gld_reader_libglade_name instead.])
+	fi
+
+	# libglade specified, or auto and no gtkbuilder. gtkmm2.4-compatible libglademm is >= 2.4.0.
+	# (not sure about libglade version).
+	if test "x$app_cv_gld_reader" = "xnone"; then
+		if test "x$app_cv_gld_reader_libglade_name" = "xlibglade"; then
+			# libglade
+			PKG_CHECK_MODULES([LIBGLADE], [$app_cv_gld_reader_libglade_pkg_name >= 2.4.0],
+					[app_cv_gld_reader="libglade"], [AC_MSG_WARN([$LIBGLADE_PKG_ERRORS])])
+			app_cv_gld_reader_CFLAGS="$LIBGLADE_CFLAGS";
+			app_cv_gld_reader_CXXFLAGS="$LIBGLADE_CFLAGS";
+			app_cv_gld_reader_LIBS="$LIBGLADE_LIBS";
+		else
+			# libglademm
+			PKG_CHECK_MODULES([LIBGLADEMM], [$app_cv_gld_reader_libglade_pkg_name >= 2.4.0],
+					[app_cv_gld_reader="libglade"], [AC_MSG_WARN([$LIBGLADEMM_PKG_ERRORS])])
+			app_cv_gld_reader_CFLAGS=""
+			app_cv_gld_reader_CXXFLAGS="$LIBGLADEMM_CFLAGS";
+			app_cv_gld_reader_LIBS="$LIBGLADEMM_LIBS";
+		fi
+		# reset them so they don't interfere later
+		LIBGLADE_CFLAGS="";
+		LIBGLADE_LIBS="";
+	fi
+
+	if test "x$with_libglade" = "xyes" && test "x$app_cv_gld_reader" = "xnone"; then
+		AC_MSG_ERROR([$app_cv_gld_reader_libglade_name not found. Try building with GtkBuilder support (you need $app_cv_gld_reader_gtk_name version 2.12 or higher).])
+	fi
+
+	# still not found.
+	if test "$app_cv_gld_reader" = "none"; then
+		AC_MSG_WARN([Neither GtkBuilder nor $app_cv_gld_reader_libglade_name found. The program will be unable to compile fully.])
+	fi
+
+
+	# export the flags
+	if test "x$2" != "x"; then
+		if test "x$$2[]CFLAGS" = "x"; then
+			$2[]CFLAGS="$app_cv_gld_reader_CFLAGS";
+		else
+			$2[]CFLAGS="$$2[]CFLAGS $app_cv_gld_reader_CFLAGS";
+		fi
+		if test "x$$2[]CXXFLAGS" = "x"; then
+			$2[]CXXFLAGS="$app_cv_gld_reader_CXXFLAGS";
+		else
+			$2[]CXXFLAGS="$$2[]CXXFLAGS $app_cv_gld_reader_CXXFLAGS";
+		fi
+		if test "x$$2[]LIBS" = "x"; then
+			$2[]LIBS="$app_cv_gld_reader_LIBS";
+		else
+			$2[]LIBS="$$2[]LIBS $app_cv_gld_reader_LIBS";
+		fi
+	fi
+
+
+	# export to automake.am-s
+	AM_CONDITIONAL([ENABLE_LIBGLADE], [test "$app_cv_gld_reader" = "libglade"])
+	AM_CONDITIONAL([ENABLE_GTKBUILDER], [test "$app_cv_gld_reader" = "gtkbuilder"])
+
+
+	# export to config.h
+	if test "$app_cv_gld_reader" = "libglade"; then
+		AC_DEFINE(ENABLE_LIBGLADE, 1, [Use libglade(mm) instead of GtkBuilder])
+	fi
+	if test "$app_cv_gld_reader" = "gtkbuilder"; then
+		AC_DEFINE(ENABLE_GTKBUILDER, 1, [Use GtkBuilder instead of libglademm])
+	fi
+
+	# If we move this to the start, some messages get in between, so we have to have it here.
+	AC_MSG_CHECKING([for glade file support:])
+
+	AC_MSG_RESULT([$app_cv_gld_reader])
+
+])
+
+
+
+
+
@@ -0,0 +1,254 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# APP_COMPILER_OPTIONS([flags_prefix])
+# This macro enables various compiler flags (common warnings, optimization,
+# debug, etc...), controllable through configure options.
+# flags_prefixCFLAGS, flags_prefixCXXFLAGS and flags_prefixLDFLAGS
+# will be initialized (or appended to) with the results.
+
+# DEBUG and DEBUG_BUILD will be exported to config.h in case of debug builds.
+
+# You must call AX_COMPILER_VENDOR, APP_DETECT_OS_KERNEL([target], ...)
+# and APP_DETECT_OS_ENV([target], ...) before using this macro.
+
+AC_DEFUN([APP_COMPILER_OPTIONS], [
+	# These requirements check compile-time presence, not that they were called
+	AC_REQUIRE([AX_COMPILER_VENDOR])
+	AC_REQUIRE([APP_DETECT_OS_ENV])
+
+	app_cv_compiler_options_cflags="";
+	app_cv_compiler_options_cxxflags="";
+	app_cv_compiler_options_ldflags="";
+
+
+	# ---- Common compiler options (warnings, etc...)
+
+	AC_ARG_ENABLE(common-options, AS_HELP_STRING([--enable-common-options=<compiler>|auto|none],
+			[enable useful compilation options (warnings, mostly). Accepted values are auto, none, gnu, intel, sun. (Default: auto)]),
+		[app_cv_compiler_common_options=${enableval}], [app_cv_compiler_common_options=auto])
+
+	# the default value is "yes" (if no value given after =), treat it as auto.
+	if test "x$app_cv_compiler_common_options" = "xyes" || test "x$app_cv_compiler_common_options" = "xauto"; then
+		app_cv_compiler_common_options="$ax_cv_cxx_compiler_vendor";
+	fi
+
+	if test "x$app_cv_compiler_common_options" = "xno"; then
+		# for pretty message
+		app_cv_compiler_common_options="none";
+	fi
+	AC_MSG_NOTICE([Enable common compiler flags for: $app_cv_compiler_common_options])
+
+
+	if test "x$app_cv_compiler_common_options" != "xnone"; then
+
+		# gcc / gnu environment, mingw, cygwin.
+		if test "x$app_cv_compiler_common_options" = "xgnu"; then
+
+			if test "x$app_cv_target_os_env" = "xmingw" || test "x$app_cv_target_os_env" = "xcygwin"; then
+				# mingw gcc options:
+				# -mno-cygwin - generate non-cygwin executables in cygwin's mingw.
+				# -mwindows - hide console window. possibly suppresses any std output / error.
+				# -mconsole - opposite of -mwindows, default.
+				# -mms-bitfields - make structures compatible with msvc. recommended default for non-cygwin.
+
+				app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -mms-bitfields -mwindows"
+				app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -mms-bitfields -mwindows"
+				app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -mms-bitfields -mwindows"
+			fi
+
+			# Note: Disabled -Wconversion, it was causing lots of silly warnings under x86-64.
+			app_cv_compiler_tmp_var="-Wall -Wcast-align -Wcast-qual \
+-Wctor-dtor-privacy -Wfloat-equal -Wnon-virtual-dtor -Woverloaded-virtual \
+-Wpointer-arith -Wshadow -Wsign-compare -Wsign-promo -Wundef -Wwrite-strings";
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags $app_cv_compiler_tmp_var";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags $app_cv_compiler_tmp_var";
+
+		# intel / gnu environment
+		elif test "x$app_cv_compiler_common_options" = "xintel" && test "x$app_cv_target_os_env" = "xgnu"; then
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -w1";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags \
+-ftrapuv -fstack-security-check -early-template-check -static-libgcc -static-intel \
+-Wcomment -Wdeprecated -Wextra-tokens -Wformat -Wmissing-prototypes -Wnon-virtual-dtor \
+-Wpointer-arith -Wreturn-type -Wshadow -Wtrigraphs -Wuninitialized -w1";
+			app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -static-libgcc -static-intel";
+
+		# suncc
+		elif test "x$app_cv_compiler_common_options" = "xsun"; then
+			# Enable useful language extensions (e.g. __func__ in C++). Details at
+			# http://docs.sun.com/app/docs/doc/819-5267/6n7c46drp?a=view
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags \
+w -errtags -erroff=notemsource,notused -features=extensions";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags \
+w -errtags -erroff=notemsource,notused -features=extensions";
+
+		fi
+
+	fi
+
+
+
+	# ---- Compiler options for debug builds
+
+	AC_ARG_ENABLE(debug-options, AS_HELP_STRING([--enable-debug-options=<compiler>|auto|none],
+			[enable debug build options. Accepted values are auto, none, gnu, intel, sun. (Default: none)]),
+		[app_cv_compiler_debug_options=${enableval}], [app_cv_compiler_debug_options=none])
+
+	# the default value is "yes" (if no value given after =), treat it as auto.
+	if test "x$app_cv_compiler_debug_options" = "xyes" || test "x$app_cv_compiler_debug_options" = "xauto"; then
+		app_cv_compiler_debug_options="$ax_cv_cxx_compiler_vendor";
+	fi
+
+	if test "x$app_cv_compiler_debug_options" = "xno"; then
+		# for pretty message
+		app_cv_compiler_debug_options="none";
+	fi
+	AC_MSG_NOTICE([Enable debug build flags for: $app_cv_compiler_debug_options])
+
+
+	if test "x$app_cv_compiler_debug_options" != "xnone"; then
+
+		# Define DEBUG and DEBUG_BUILD for debug builds (through config.h).
+		AC_DEFINE([DEBUG], [1], [Defined for debug builds])
+		AC_DEFINE([DEBUG_BUILD], [1], [Defined for debug builds])
+
+		# gcc, mingw
+		if test "x$app_cv_compiler_debug_options" = "xgnu"; then
+			if test "x$app_cv_target_os_env" = "xmingw" || test "x$app_cv_target_os_env" = "xcygwin"; then
+				# Enable console window for debug builds
+				app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -mconsole"
+				app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -mconsole"
+				app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -mconsole"
+			fi
+
+			# We could put libstdc++ debug options here, but it generates binary-incompatible
+			# C++ code, which leads to runtime errors with e.g. libsigc++.
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -g3 -O0";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -g3 -O0";
+			app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -g3 -O0";
+
+		# intel / gnu
+		elif test "x$app_cv_compiler_debug_options" = "xintel" && test "x$app_cv_target_os_env" = "xgnu"; then
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -g3 -O0";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -g3 -O0";
+			app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -g3 -O0";
+
+		# suncc
+		elif test "x$app_cv_compiler_debug_options" = "xsun"; then
+			# There's no -O0, it's the default. Debug format is stabs by default, but can be switched
+			# to dwarf by -xdebugformat=dwarf.
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -xs -g";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -xs -g";
+			app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -xs -g";
+
+		fi
+
+	fi
+
+
+
+	# ---- Compiler options for optimized builds
+
+	AC_ARG_ENABLE(optimize-options, AS_HELP_STRING([--enable-optimize-options=<compiler>|auto|none],
+			[enable optimized build options. Accepted values are auto, none, gnu, intel, sun. (Default: none)]),
+		[app_cv_compiler_optimize_options=${enableval}], [app_cv_compiler_optimize_options=none])
+
+	# the default value is "yes" (if no value given after =), treat it as auto.
+	if test "x$app_cv_compiler_optimize_options" = "xyes" || test "x$app_cv_compiler_optimize_options" = "xauto"; then
+		app_cv_compiler_optimize_options="$ax_cv_cxx_compiler_vendor";
+	fi
+
+	if test "x$app_cv_compiler_optimize_options" = "xno"; then
+		# for pretty message
+		app_cv_compiler_optimize_options="none";
+	fi
+	AC_MSG_NOTICE([Enable optimized build flags for: $app_cv_compiler_optimize_options])
+
+
+	if test "x$app_cv_compiler_optimize_options" != "xnone"; then
+
+		# gcc, mingw
+		if test "x$app_cv_compiler_optimize_options" = "xgnu"; then
+			# -mtune=generic is since gcc 4.0 iirc
+			if test "$app_cv_target_os_env" = "mingw" || test "$app_cv_target_os_env" = "cygwin"; then
+				app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -g0 -O3 -s -march=i586";
+				app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -g0 -O3 -s -march=i586";
+				app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -g0 -O3 -s -march=i586";
+			else
+				app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -g0 -O3 -s -mtune=generic";
+				app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -g0 -O3 -s -mtune=generic";
+				app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -g0 -O3 -s -mtune=generic";
+			fi
+
+		# intel / gnu
+		elif test "x$app_cv_compiler_optimize_options" = "xintel" && test "x$app_cv_target_os_env" = "xgnu"; then
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -g0 -O3 -s";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -g0 -O3 -s";
+			app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -g0 -O3 -s";
+
+		# suncc
+		elif test "x$app_cv_compiler_optimize_options" = "xsun"; then
+			# There's no -O0, it's the default. Debug format is stabs by default, but can be switched
+			# to dwarf by -xdebugformat=dwarf.
+			app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -xO5";
+			app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -xO5";
+			app_cv_compiler_options_ldflags="$app_cv_compiler_options_ldflags -s";
+
+		fi
+
+	fi
+
+
+
+	# ---- Compiler options for GCC pch support
+
+	AC_ARG_ENABLE(gcc-pch,
+		AS_HELP_STRING([--enable-gcc-pch],[enable precompiled header support (pch make target) (GCC only) (default: disabled)
+				(use "make gch" to speed up the compilation, but don't enable it if you don't intend to use it - it will slow things down)]),
+		[app_cv_compiler_gcc_pch=${enableval}], [app_cv_compiler_gcc_pch=no])
+
+	AC_MSG_NOTICE([Enable GCC precompiled header usage: $app_cv_compiler_gcc_pch])
+
+	# Don't check the vendor here - it's disabled by default, so it's on the user.
+	if test "x$app_cv_compiler_gcc_pch" = "xyes"; then
+		app_cv_compiler_options_cflags="$app_cv_compiler_options_cflags -Winvalid-pch -DENABLE_PCH"
+		app_cv_compiler_options_cxxflags="$app_cv_compiler_options_cxxflags -Winvalid-pch -DENABLE_PCH"
+	fi
+
+
+
+	# ---- Export our variables
+
+	if test "x$$1[]CFLAGS" = "x"; then
+		$1[]CFLAGS="$app_cv_compiler_options_cflags";
+	else
+		$1[]CFLAGS="$$1[]CFLAGS $app_cv_compiler_options_cflags";
+	fi
+	if test "x$$1[]CXXFLAGS" = "x"; then
+		$1[]CXXFLAGS="$app_cv_compiler_options_cxxflags";
+	else
+		$1[]CXXFLAGS="$$1[]CXXFLAGS $app_cv_compiler_options_cxxflags";
+	fi
+	if test "x$$1[]LDFLAGS" = "x"; then
+		$1[]LDFLAGS="$app_cv_compiler_options_ldflags";
+	else
+		$1[]LDFLAGS="$$1[]LDFLAGS $app_cv_compiler_options_ldflags";
+	fi
+
+
+	AC_MSG_NOTICE([Compiler-specific build options:])
+	AC_MSG_NOTICE([CFLAGS: $app_cv_compiler_options_cflags])
+	AC_MSG_NOTICE([CXXFLAGS: $app_cv_compiler_options_cxxflags])
+	AC_MSG_NOTICE([LDFLAGS: $app_cv_compiler_options_ldflags])
+
+])
+
+
+
+
+
@@ -0,0 +1,46 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# Check whether C++ compiler supports overloading between
+# extern "C" function pointer and C++ function pointer. GCC and
+# Intel treat them equally, so no overloads are needed (or accepted)
+# there.
+
+# SunCC accepts C++-to-C function pointer assignment in function
+# parameters, but not in constructor parameters. To make such
+# code work an additional C-function-pointer constructor must be
+# specified. Then the constructor itself can make the conversion
+# (with a compiler warning though).
+
+# SunCC also disallows C-to-C++ function pointer specification
+# for template parameters (I don't remember the exact details).
+
+
+# If such support is found, HAVE_CXX_EXTERN_C_OVERLOAD is defined.
+
+
+AC_DEFUN([APP_CXX_EXTERN_C_OVERLOAD], [
+	AC_CACHE_CHECK(whether $CXX accepts extern C function pointer overload, ac_cv_cxx_extern_c_overload, [
+		AC_LANG_PUSH([C++])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+			extern "C" { typedef void (*c_func_t)(void); }
+			typedef void (*cpp_func_t)(void);
+			void f1(c_func_t f) { }
+			void f1(cpp_func_t f) { }
+		]], [[]])],
+		[ac_cv_cxx_extern_c_overload=yes], [ac_cv_cxx_extern_c_overload=no])
+		AC_LANG_POP([])
+	])
+	if test "x$ac_cv_cxx_extern_c_overload" = "xyes"; then
+		AC_DEFINE(HAVE_CXX_EXTERN_C_OVERLOAD, ,
+			[Define if the C++ complier accepts extern C function pointer overload])
+	fi
+])
+
+
+
@@ -0,0 +1,44 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# Check whether C++ compiler supports C99 __func__.
+
+AC_DEFUN([APP_CXX___FUNC__], [
+	AC_CACHE_CHECK(whether $CXX recognizes __func__, app_cv_cxx___func__, [
+		AC_LANG_PUSH([C++])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+			[[const char* s = __func__;]])],
+		[app_cv_cxx___func__=yes], [app_cv_cxx___func__=no])
+		AC_LANG_POP([])
+	])
+	if test "x$app_cv_cxx___func__" = "xyes"; then
+		AC_DEFINE(HAVE_CXX___func__, ,
+			[Define if the C++ complier supports __func__])
+	fi
+])
+
+
+
+# Check whether C++ compiler supports __FUNCTION__.
+
+AC_DEFUN([APP_CXX___FUNCTION__], [
+	AC_CACHE_CHECK(whether $CXX recognizes __FUNCTION__, app_cv_cxx___FUNCTION__, [
+		AC_LANG_PUSH([C++])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+			[[const char* s = __FUNCTION__;]])],
+		[app_cv_cxx___FUNCTION__=yes], [app_cv_cxx___FUNCTION__=no])
+		AC_LANG_POP([])
+	])
+	if test "x$app_cv_cxx___FUNCTION__" = "xyes"; then
+		AC_DEFINE(HAVE_CXX___FUNCTION__, ,
+			[Define if the C++ complier supports __FUNCTION__])
+	fi
+])
+
+
+
@@ -0,0 +1,323 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# APP_DETECT_OS_KERNEL(triplet_name, define_macro_prefix)
+# Check target OS kernel.
+# triplet_name is target, host or build.
+# You must call AX_COMPILER_VENDOR before using this macro.
+
+# If you call
+# APP_DETECT_OS_KERNEL([target], [CONFIG_KERNEL])
+# you will get CONFIG_KERNEL_LINUX C macro exported to config.h
+# (on gcc/linux).
+# If no define_macro_prefix is specified, no C macro prefix will be used.
+# app_cv_target_os_kernel will be set to kernel name (lowercase).
+# app_cv_target_os_kernel_macro will be set to kernel name (all caps).
+# TARGET_OS_KERNEL_LINUX automake conditional will be set to true.
+
+# Note: Some operating systems / compilers have built-in defines.
+# For gcc, check with
+# $ gcc -dM -E - < /dev/null
+
+AC_DEFUN([APP_DETECT_OS_KERNEL], [
+	# These requirements check compile-time presence, not that they were called
+	AC_REQUIRE([AX_COMPILER_VENDOR])
+
+	AC_MSG_CHECKING([for $1 OS kernel])
+
+	app_cv_[]$1[]_os_kernel="";
+	app_cv_[]$1[]_os_kernel_macro="";
+
+	# If vendor is not recognized, it's set to "unknown".
+	# NOTE: This works only on target compilers!
+	if test "x${ax_cv_cxx_compiler_vendor}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[ax_cv_cxx_compiler_vendor] not set.])
+	fi
+
+	# "build" - the type of system on which the package is being configured and compiled.
+	# "host" - the type of system on which the package runs. Specifying it enables the
+	# cross-compilation mode. "target" defaults to this too.
+
+	if test "x$1" != "xbuild" && test "x$1" != "xhost" && test "x$1" != "xtarget"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[Triplet name must be build, host or target.]])
+	fi
+
+	case "$$1" in
+		*linux*)
+			# gcc defines __linux__ on linux. Other defines include: __linux, __unix__, __gnu_linux__,
+			# linux, unix, __i386__, i386.
+			app_cv_[]$1[]_os_kernel="linux";
+			app_cv_[]$1[]_os_kernel_macro="LINUX";
+			;;
+
+		*mingw* | *cygwin*)
+			# mingw defines _WIN32. msvc defines _WIN32 (built-in), and WIN32 via windows.h.
+			# Other mingw defines include: __WINNT, __WINNT__, __WIN32__, __i386, _X86_,
+			# i386, __i386__, WIN32, __MINGW32__, WINNT (all equal to 1).
+			app_cv_[]$1[]_os_kernel="windows";
+			app_cv_[]$1[]_os_kernel_macro="WINDOWS";
+			;;
+
+		# This includes debian gnu/kfreebsd. Dragonfly is checked separately.
+		*freebsd*)
+			# gcc built-in defines (to check for freebsd kernel):
+			# defined(__FreeBSD__) || defined(__FreeBSD_kernel__).
+			# See http://glibc-bsd.alioth.debian.org/porting/PORTING .
+			app_cv_[]$1[]_os_kernel="freebsd";
+			app_cv_[]$1[]_os_kernel_macro="FREEBSD";
+			;;
+
+		*dragonfly*)
+			app_cv_[]$1[]_os_kernel="dragonfly";
+			app_cv_[]$1[]_os_kernel_macro="DRAGONFLY";
+			;;
+
+		*openbsd*)
+			app_cv_[]$1[]_os_kernel="openbsd";
+			app_cv_[]$1[]_os_kernel_macro="OPENBSD";
+			;;
+
+		# This includes debian gnu/netbsd.
+		*netbsd*)
+			app_cv_[]$1[]_os_kernel="netbsd";
+			app_cv_[]$1[]_os_kernel_macro="NETBSD";
+			;;
+
+		*solaris*)
+			app_cv_[]$1[]_os_kernel="solaris";
+			app_cv_[]$1[]_os_kernel_macro="SOLARIS";
+			;;
+
+		*darwin*)
+			app_cv_[]$1[]_os_kernel="darwin";
+			app_cv_[]$1[]_os_kernel_macro="DARWIN";
+			;;
+
+		*qnx*)
+			app_cv_[]$1[]_os_kernel="qnx";
+			app_cv_[]$1[]_os_kernel_macro="QNX";
+			;;
+
+		*)
+			app_cv_[]$1[]_os_kernel="unknown";
+			app_cv_[]$1[]_os_kernel_macro="UNKNOWN";
+			;;
+	esac
+
+	# Assign this - we may use this in configure itself.
+	if test "x$2" != "x"; then
+		app_cv_[]$1[]_os_kernel_macro="$2[]_${app_cv_[]$1[]_os_kernel_macro}";
+	fi
+
+
+	# config.h macros (yes, we need this many. otherwise config.h will be incorrect).
+
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xlinux"; then
+		AC_DEFINE($2[]LINUX, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xwindows"; then
+		AC_DEFINE($2[]WINDOWS, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xfreebsd"; then
+		AC_DEFINE($2[]FREEBSD, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xdragonfly"; then
+		AC_DEFINE($2[]DRAGONFLY, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xopenbsd"; then
+		AC_DEFINE($2[]OPENBSD, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xnetbsd"; then
+		AC_DEFINE($2[]NETBSD, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xsolaris"; then
+		AC_DEFINE($2[]SOLARIS, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xdarwin"; then
+		AC_DEFINE($2[]DARWIN, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xqnx"; then
+		AC_DEFINE($2[]QNX, 1, [$1 OS kernel])
+	fi
+	if test "x${app_cv_[]$1[]_os_kernel}" = "xunknown"; then
+		AC_DEFINE($2[]UNKNOWN, 1, [$1 OS kernel])
+	fi
+
+	# Export to Makefile.am's.
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_LINUX, [test "x${app_cv_[]$1[]_os_kernel}" = "xlinux"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_WINDOWS, [test "x${app_cv_[]$1[]_os_kernel}" = "xwindows"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_FREEBSD, [test "x${app_cv_[]$1[]_os_kernel}" = "xfreebsd"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_DRAGONFLY, [test "x${app_cv_[]$1[]_os_kernel}" = "xdragonfly"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_OPENBSD, [test "x${app_cv_[]$1[]_os_kernel}" = "xopenbsd"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_NETBSD, [test "x${app_cv_[]$1[]_os_kernel}" = "xnetbsd"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_SOLARIS, [test "x${app_cv_[]$1[]_os_kernel}" = "xsolaris"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_DARWIN, [test "x${app_cv_[]$1[]_os_kernel}" = "xdarwin"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_QNX, [test "x${app_cv_[]$1[]_os_kernel}" = "xqnx"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_KERNEL_UNKNOWN, [test "x${app_cv_[]$1[]_os_kernel}" = "xunknown"])
+
+	AC_MSG_RESULT([${app_cv_[]$1[]_os_kernel}])
+])
+
+
+
+
+# APP_DETECT_OS_ENV(triplet_name, define_macro_prefix)
+# Check target OS userland environment (mainly glibc).
+# triplet_name is target, host or build.
+# You must call AX_COMPILER_VENDOR before using this macro.
+
+# If you call
+# APP_DETECT_OS_ENV([target], [COMPILER], [CONFIG_OS_ENV])
+# you will get CONFIG_OS_ENV_LINUX C macro exported to config.h
+# (on gcc/linux).
+# If no define_macro_prefix is specified, no C macro prefix will be used.
+# app_cv_target_os_env will be set to env name (lowercase).
+# app_cv_target_os_env_macro will be set to env name (all caps).
+# TARGET_OS_ENV_LINUX automake conditional will be set to true.
+
+AC_DEFUN([APP_DETECT_OS_ENV], [
+	# These requirements check compile-time presence, not that they were called
+	AC_REQUIRE([AX_COMPILER_VENDOR])
+
+	AC_MSG_CHECKING([for $1 OS userland environment])
+
+	app_cv_[]$1[]_os_env="";
+	app_cv_[]$1[]_os_env_macro="";
+
+	# If vendor is not recognized, it's set to "unknown".
+	# NOTE: This works only on target compilers!
+	if test "x${ax_cv_cxx_compiler_vendor}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[ax_cv_cxx_compiler_vendor] not set.])
+	fi
+
+	# "build" - the type of system on which the package is being configured and compiled.
+	# "host" - the type of system on which the package runs. Specifying it enables the
+	# cross-compilation mode. "target" defaults to this too.
+
+	if test "x$1" != "xbuild" && test "x$1" != "xhost" && test "x$1" != "xtarget"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[Triplet name must be build, host or target.]])
+	fi
+
+	case "$$1" in
+		*cygwin*)
+			app_cv_[]$1[]_os_env="cygwin";
+			app_cv_[]$1[]_os_env_macro="CYGWIN";
+			;;
+		*mingw*)
+			app_cv_[]$1[]_os_env="mingw";
+			app_cv_[]$1[]_os_env_macro="MINGW";
+			;;
+		# This includes gnu/linux, debian gnu/kfreebsd, debian gnu/netbsd...
+		*-gnu | gnu*)
+			app_cv_[]$1[]_os_env="gnu";
+			app_cv_[]$1[]_os_env_macro="GNU";
+			;;
+		# Freebsd libc
+		*freebsd*)
+			app_cv_[]$1[]_os_env="freebsd";
+			app_cv_[]$1[]_os_env_macro="FREEBSD";
+			;;
+		*dragonfly*)
+			app_cv_[]$1[]_os_env="dragonfly";
+			app_cv_[]$1[]_os_env_macro="DRAGONFLY";
+			;;
+		*openbsd*)
+			app_cv_[]$1[]_os_env="openbsd";
+			app_cv_[]$1[]_os_env_macro="OPENBSD";
+			;;
+		*netbsd*)
+			app_cv_[]$1[]_os_env="netbsd";
+			app_cv_[]$1[]_os_env_macro="NETBSD";
+			;;
+		*solaris*)
+			app_cv_[]$1[]_os_env="solaris";
+			app_cv_[]$1[]_os_env_macro="SOLARIS";
+			;;
+		*darwin*)
+			app_cv_[]$1[]_os_env="darwin";
+			app_cv_[]$1[]_os_env_macro="DARWIN";
+			;;
+		*qnx*)
+			app_cv_[]$1[]_os_env="qnx";
+			app_cv_[]$1[]_os_env_macro="QNX";
+			;;
+		*)
+			app_cv_[]$1[]_os_env="unknown";
+			app_cv_[]$1[]_os_env_macro="UNKNOWN";
+			;;
+	esac
+
+	# Assign this even if not using flags - we may use this in configure itself.
+	if test "x$2" != "x"; then
+		app_cv_[]$1[]_os_env_macro="$2[]_${app_cv_[]$1[]_os_env_macro}";
+	fi
+
+
+	# config.h macros (yes, we need this many. otherwise config.h will be incorrect).
+
+	if test "x${app_cv_[]$1[]_os_env}" = "xcygwin"; then
+		AC_DEFINE($2[]CYGWIN, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xmingw"; then
+		AC_DEFINE($2[]MINGW, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xgnu"; then
+		AC_DEFINE($2[]GNU, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xfreebsd"; then
+		AC_DEFINE($2[]FREEBSD, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xdragonfly"; then
+		AC_DEFINE($2[]DRAGONFLY, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xopenbsd"; then
+		AC_DEFINE($2[]OPENBSD, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xnetbsd"; then
+		AC_DEFINE($2[]NETBSD, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xsolaris"; then
+		AC_DEFINE($2[]SOLARIS, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xdarwin"; then
+		AC_DEFINE($2[]DARWIN, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xqnx"; then
+		AC_DEFINE($2[]QNX, 1, [$1 OS userspace environment])
+	fi
+	if test "x${app_cv_[]$1[]_os_env}" = "xunknown"; then
+		AC_DEFINE($2[]UNKNOWN, 1, [$1 OS userspace environment])
+	fi
+
+	# Export to Makefile.am's.
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_CYGWIN, [test "x${app_cv_[]$1[]_os_env}" = "xcygwin"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_MINGW, [test "x${app_cv_[]$1[]_os_env}" = "xmingw"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_GNU, [test "x${app_cv_[]$1[]_os_env}" = "xgnu"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_FREEBSD, [test "x${app_cv_[]$1[]_os_env}" = "xfreebsd"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_DRAGONFLY, [test "x${app_cv_[]$1[]_os_env}" = "xdragonfly"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_OPENBSD, [test "x${app_cv_[]$1[]_os_env}" = "xopenbsd"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_NETBSD, [test "x${app_cv_[]$1[]_os_env}" = "xnetbsd"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_SOLARIS, [test "x${app_cv_[]$1[]_os_env}" = "xsolaris"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_DARWIN, [test "x${app_cv_[]$1[]_os_env}" = "xdarwin"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_QNX, [test "x${app_cv_[]$1[]_os_env}" = "xqnx"])
+	AM_CONDITIONAL(m4_toupper($1)[]_OS_ENV_UNKNOWN, [test "x${app_cv_[]$1[]_os_env}" = "xunknown"])
+
+	AC_MSG_RESULT([${app_cv_[]$1[]_os_env}])
+])
+
+
+
+
@@ -0,0 +1,171 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# APP_GET_MT_FLAGS(flags_prefix[, action-if-not-found])
+# This macro detects compiler flags which are needed to compile a multi-threaded
+# (possibly pthreads-based) applications on target OS. flags_prefixCFLAGS,
+# flags_prefixCXXFLAGS and flags_prefixLIBS will be initialized (or appended to)
+# with the correct flags.
+
+# You must call AX_COMPILER_VENDOR, APP_DETECT_OS_KERNEL([target], ...)
+# and APP_DETECT_OS_ENV([target], ...) before using this macro.
+
+AC_DEFUN([APP_GET_MT_FLAGS], [
+	# These requirements check compile-time presence, not that they were called
+	AC_REQUIRE([AX_COMPILER_VENDOR])
+	AC_REQUIRE([APP_DETECT_OS_KERNEL])
+	AC_REQUIRE([APP_DETECT_OS_ENV])
+
+	AC_MSG_CHECKING([for target thread support flags])
+
+	app_cv_target_thread_cflags="";
+	app_cv_target_thread_cxxflags="";
+	app_cv_target_thread_libs="";
+	app_cv_target_thread_found="no";
+
+	# If vendor is not recognized, it's set to "unknown".
+	# NOTE: This works only on target compilers!
+	if test "x${ax_cv_cxx_compiler_vendor}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[ax_cv_cxx_compiler_vendor] not set.])
+	fi
+	if test "x${app_cv_target_os_kernel}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[app_cv_target_os_kernel] not set.])
+	fi
+	if test "x${app_cv_target_os_env}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[app_cv_target_os_env] not set.])
+	fi
+
+
+	# Compilers use at least 3 defines to indicate thread-safe support to standard libs:
+	# _THREAD_SAFE, _MT, _REENTRANT.
+	# We use the ones that are required for detected platform.
+
+	case "$app_cv_target_os_kernel" in
+		linux)
+			# glibc manual says that defining either _REENTRANT or _THREAD_SAFE
+			# enables some thread-safe implementations of glibc functions.
+			if test "$ax_cv_cxx_compiler_vendor" = "gnu" || test "$ax_cv_cxx_compiler_vendor" = "intel" \
+					|| test "$ax_cv_cxx_compiler_vendor" = "pathscale"; then
+				app_cv_target_thread_cflags="-pthread -D_MT -D_THREAD_SAFE"
+				app_cv_target_thread_cxxflags="-pthread -D_MT -D_THREAD_SAFE"
+				app_cv_target_thread_libs="-pthread"
+				app_cv_target_thread_found="yes";
+
+			elif test "$ax_cv_cxx_compiler_vendor" = "sun"; then
+				# suncc needs -lpthread on posix but not solaris.
+				# -mt defines _REENTRANT too. Don't use -lthread.
+				app_cv_target_thread_cflags="-mt"
+				app_cv_target_thread_cxxflags="-mt"
+				app_cv_target_thread_libs="-mt -lpthread"
+				app_cv_target_thread_found="yes";
+
+			fi
+			;;
+
+		windows)
+			# NOTE: Not sure about cygwin.
+			# NOTE: This only enables multithreaded code generation. For linking
+			# with pthreads-win32 you need additional flags.
+			# gcc man page: -mthreads: Support thread-safe exception handling on Mingw32.
+			# -mthreads defines -D_MT, and links with -lmingwthrd.
+			if test "$ax_cv_cxx_compiler_vendor" = "gnu"; then
+				app_cv_target_thread_cflags="-mthreads -D_THREAD_SAFE"
+				app_cv_target_thread_cxxflags="-mthreads -D_THREAD_SAFE"
+				app_cv_target_thread_libs="-mthreads"
+				app_cv_target_thread_found="yes"
+			fi
+			;;
+
+		freebsd | dragonfly | netbsd | openbsd)
+			# NOTE: Not sure about debian gnu/kfreebsd and gnu/netbsd.
+			# Freebsd had -kthread, but it has been discontinued (afaik).
+			# For freebsd -pthread already replaces libc with libc_r.
+			if test "$ax_cv_cxx_compiler_vendor" = "gnu"; then
+				app_cv_target_thread_cflags="-pthread -D_MT -D_THREAD_SAFE"
+				app_cv_target_thread_cxxflags="-pthread -D_MT -D_THREAD_SAFE"
+				app_cv_target_thread_libs="-pthread"
+				app_cv_target_thread_found="yes";
+			fi
+			;;
+
+		solaris)
+			if test "$ax_cv_cxx_compiler_vendor" = "gnu"; then
+				# gnu documentation mentions -threads (and its aliases, -pthreads and -pthread)
+				app_cv_target_thread_cflags="-pthreads -D_MT -D_THREAD_SAFE"
+				app_cv_target_thread_cxxflags="-pthreads -D_MT -D_THREAD_SAFE"
+				app_cv_target_thread_libs="-pthreads"
+				app_cv_target_thread_found="yes"
+
+			elif test "$ax_cv_cxx_compiler_vendor" = "sun"; then
+				# -mt defines _REENTRANT too. Don't use -lthread.
+				# http://docs.sun.com/app/docs/doc/816-5175/pthreads-5?a=view
+				# http://docs.sun.com/app/docs/doc/816-5137/compile-74765?a=view
+				# There are two threading libraries, selectable via different switches.
+				app_cv_target_thread_cflags="-mt"
+				app_cv_target_thread_cxxflags="-mt"
+				app_cv_target_thread_libs="-mt"
+				app_cv_target_thread_found="yes"
+			fi
+			;;
+
+		darwin)
+			if test "$ax_cv_cxx_compiler_vendor" = "gnu"; then
+				# Darwin produces mt code by default, and -pthread is an error.
+				# gcc/darwin defines __APPLE__. __UNIX__ is not defined.
+				# -D_THREAD_SAFE
+				app_cv_target_thread_found="yes"
+			fi
+			;;
+
+		qnx)
+			if test "$ax_cv_cxx_compiler_vendor" = "gnu"; then
+				# afaik, gcc/qnx produces mt code by default (at least on newer qnx releases),
+				# so no flags are needed.
+				app_cv_target_thread_found="yes"
+			fi
+			;;
+
+	esac
+
+
+	if test "$app_cv_target_thread_found" = "no"; then
+		AC_MSG_WARN([Cannot detect compiler thread support. Set CFLAGS, CXXFLAGS and LIBS manually.])
+		m4_ifvaln([$2],[$2])dnl
+
+	else
+		AC_MSG_RESULT([CFLAGS: $app_cv_target_thread_cflags;  CXXFLAGS: $app_cv_target_thread_cxxflags;  LIBS: $app_cv_target_thread_libs])
+
+		if test "x$$1[]CFLAGS" = "x"; then
+			$1[]CFLAGS="$app_cv_target_thread_cflags";
+		else
+			$1[]CFLAGS="$$1[]CFLAGS $app_cv_target_thread_cflags";
+		fi
+		if test "x$$1[]CXXFLAGS" = "x"; then
+			$1[]CXXFLAGS="$app_cv_target_thread_cxxflags";
+		else
+			$1[]CXXFLAGS="$$1[]CXXFLAGS $app_cv_target_thread_cxxflags";
+		fi
+		if test "x$$1[]LIBS" = "x"; then
+			$1[]LIBS="$app_cv_target_thread_libs";
+		else
+			$1[]LIBS="$$1[]LIBS $app_cv_target_thread_libs";
+		fi
+	fi
+
+])
+
+
+
+
+
@@ -0,0 +1,101 @@
+
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+
+# APP_USE_SYSTEM_EXTENSIONS([flags_prefix])
+# This macro detects compiler flags which are needed to enable
+# system-specific library extensions. For example, on GNU platforms
+# it's -D_GNU_SOURCE, on solaris it's -D__EXTENSIONS__, etc...
+# Basically, it's the same as AC_USE_SYSTEM_EXTENSIONS,
+# but uses compiler flag approach instead of config.h.
+
+# You must call AX_COMPILER_VENDOR
+# and APP_DETECT_OS_ENV([target], ...) before using this macro.
+
+# More info:
+# http://www.gnu.org/software/autoconf/manual/autoconf.html#Posix-Variants
+# http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
+# http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.predefined
+# http://docs.sun.com/app/docs/doc/817-3946/6mjgmt4o8?l=en&a=view
+
+AC_DEFUN([APP_USE_SYSTEM_EXTENSIONS], [
+	# These requirements check compile-time presence, not that they were called
+	AC_REQUIRE([AX_COMPILER_VENDOR])
+	AC_REQUIRE([APP_DETECT_OS_ENV])
+
+	AC_MSG_CHECKING([for target system extension flags])
+
+	app_cv_target_extension_cflags="";
+	app_cv_target_extension_cxxflags="";
+	app_cv_target_extension_libs="";
+
+
+	# If vendor is not recognized, it's set to "unknown".
+	# NOTE: This works only on target compilers!
+	if test "x${ax_cv_cxx_compiler_vendor}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[ax_cv_cxx_compiler_vendor] not set.])
+	fi
+	if test "x${app_cv_target_os_kernel}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[app_cv_target_os_kernel] not set.])
+	fi
+	if test "x${app_cv_target_os_env}" = "x"; then
+		# msg_result is needed to print the checking... message.
+		AC_MSG_RESULT([error])
+		AC_MSG_ERROR([[app_cv_target_os_env] not set.])
+	fi
+
+
+	case "$app_cv_target_os_env" in
+		gnu)
+			# glibc all-extensions macro: _GNU_SOURCE.
+			# gcc automatically defines it in later versions.
+			# suncc needs the flag explicitly.
+			# http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
+			app_cv_target_extension_cflags="-D_GNU_SOURCE"
+			app_cv_target_extension_cxxflags="-D_GNU_SOURCE"
+			;;
+
+		solaris)
+			# The problem with solaris is that it has too many incompatible
+			# feature test macros, and there is no enable-all macro. Autoconf
+			# mistakenly assumes that __EXTENSIONS__ is the one, but
+			# it should be defined _in addition_ to feature test macros.
+			# To support some posix macros, additional link objects are also required.
+			# http://docs.sun.com/app/docs/doc/816-5175/standards-5?a=view
+			;;
+
+	esac
+
+
+	AC_MSG_RESULT([CFLAGS: $app_cv_target_extension_cflags;  CXXFLAGS: $app_cv_target_extension_cxxflags;  LIBS: $app_cv_target_extension_libs])
+
+	if test "x$$1[]CFLAGS" = "x"; then
+		$1[]CFLAGS="$app_cv_target_extension_cflags";
+	else
+		$1[]CFLAGS="$$1[]CFLAGS $app_cv_target_extension_cflags";
+	fi
+	if test "x$$1[]CXXFLAGS" = "x"; then
+		$1[]CXXFLAGS="$app_cv_target_extension_cxxflags";
+	else
+		$1[]CXXFLAGS="$$1[]CXXFLAGS $app_cv_target_extension_cxxflags";
+	fi
+	if test "x$$1[]LIBS" = "x"; then
+		$1[]LIBS="$app_cv_target_extension_libs";
+	else
+		$1[]LIBS="$$1[]LIBS $app_cv_target_extension_libs";
+	fi
+
+])
+
+
+
+
+
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 stamp="../gsmartcontrol-`date +%F`"
 echo $stamp
@@ -1,13 +1,16 @@

-AC_INIT([GSmartControl], [0.8.0rc2], [], [gsmartcontrol])
+AC_INIT([GSmartControl], 0.8.2, [], [gsmartcontrol])

 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])

 AC_CANONICAL_TARGET

-# disable portability warnings because of pattern rules in src/res.
-AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2 -Wall,no-portability])
+AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2 -Wall])
+
+
+# Clear *FLAGS, LIBS, LDFLAGS if requested through configure option.
+APP_AUTO_CLEAR_FLAGS()

 # C compiler, C preprocessor
 AC_PROG_CC
@@ -24,46 +27,51 @@ AC_PROG_CXX
 #AC_LANG([C])
 AC_LANG([C++])

-# to be able to generate static libs
+# Needed for generating static libs
 AC_CHECK_TOOL(RANLIB, ranlib)

+# Win32 resource file compilation
+AC_CHECK_TOOL(WINDRES, windres)
+
+# Win32 external dll stripping (already detected by autoconf)
+# AC_CHECK_TOOL(STRIP, strip)
+

 # -------------------------------------------------------------------------------------

 # -------------------------------------------------------------------------------------


-# Various compiler features
+# ------------- Detect compiler, OS, environment. Enable system features.
+

 # detect compiler vendor (sets $ax_cv_cxx_compiler_vendor)
 AX_COMPILER_VENDOR

-# detect RTTI (defines HAVE_RTTI)
-AC_CXX_RTTI
+# Detect target OS kernel and userspace and export to config.h
+# (also define automake conditionals).
+APP_DETECT_OS_KERNEL([target], [CONFIG_KERNEL_])
+APP_DETECT_OS_ENV([target], [CONFIG_OS_ENV_])

-# detect exception support (defines HAVE_EXCEPTIONS)
-AC_CXX_EXCEPTIONS
+# Detect common (warning, debug, optimize) compiler flags and
+# export them to C(XX)FLAGS, LDFLAGS.
+# We don't use prefix because this way the flags will be used for tests,
+# which is important for some compatibility flags (e.g. __func__ visibility, etc...).
+APP_COMPILER_OPTIONS([])

-# detect abi::__cxa_demangle (defines HAVE_GCC_ABI_DEMANGLE)
-AX_CXX_GCC_ABI_DEMANGLE
+# Thread support for known configurations.
+APP_GET_MT_FLAGS([])

-# detect __gnu_cxx::__verbose_terminate_handler (defines HAVE_VERBOSE_TERMINATE_HANDLER.)
-AC_CXX_VERBOSE_TERMINATE_HANDLER
+# Enable _GNU_SOURCE, etc...
+APP_USE_SYSTEM_EXTENSIONS([])

-# detect __func__ support (defines HAVE_CXX__FUNC)
-AC_CXX_VAR_FUNC
-
-
-# -------------------------------------------------------------------------------------
-
-# -------------------------------------------------------------------------------------
-
-
-# Portability stuff
-
-# arrange large file support (define _FILE_OFFSET_BITS 64, etc...)
+# Arrange large file support (define _FILE_OFFSET_BITS 64, etc...)
 AC_SYS_LARGEFILE

+
+
+# ------------- Correct incomplete standard libraries
+
 # define int8_t and friends if the standard doesn't have them
 AC_TYPE_INT8_T
 AC_TYPE_UINT8_T
@@ -79,6 +87,33 @@ AC_TYPE_UINTMAX_T
 AC_TYPE_LONG_LONG_INT
 AC_TYPE_UNSIGNED_LONG_LONG_INT

+
+
+# ------------- Language / Standard Library checks
+
+# detect RTTI (defines HAVE_RTTI)
+AC_CXX_RTTI
+
+# detect exception support (defines HAVE_EXCEPTIONS)
+AC_CXX_EXCEPTIONS
+
+# detect abi::__cxa_demangle (defines HAVE_GCC_ABI_DEMANGLE)
+AX_CXX_GCC_ABI_DEMANGLE
+
+# detect __gnu_cxx::__verbose_terminate_handler (defines HAVE_VERBOSE_TERMINATE_HANDLER.)
+AC_CXX_VERBOSE_TERMINATE_HANDLER
+
+# detect __func__ support (defines HAVE_CXX___func__)
+APP_CXX___FUNC__
+
+# detect __FUNCTION__ support (defines HAVE_CXX___FUNCTION__)
+APP_CXX___FUNCTION__
+
+# detect if the compiler accepts extern "C" function pointer overloads
+# (defines HAVE_CXX_EXTERN_C_OVERLOAD)
+APP_CXX_EXTERN_C_OVERLOAD
+
+
 # This may be needed for pch support
 AC_CHECK_HEADERS([stdc++.h])

@@ -87,9 +122,9 @@ AC_CHECK_FUNCS([strtoll _strtoi64], [break])

 # Non-C99 systems don't have strtof and strtold. some have strtodf for strtof,
 # but let's ignore it. Note: They may be supported by system libc,
-# but unsupported by headers (e.g. sun studio on linux). In that case,
+# but not enabled by default (e.g. by glibc feature macros). In that case,
 # defining them still leads to undefined symbols at link time, so we don't do it.
-# header / link check:
+# Header check is the best way to determine availability:
 AC_CHECK_DECLS([strtof, strtold], [], [], [[#include <stdlib.h>]])
 # link check only:
 # AC_CHECK_FUNCS([strtof strtold])
@@ -100,39 +135,10 @@ AC_CHECK_DECLS([strtof, strtold], [], [], [[#include <stdlib.h>]])
 # -------------------------------------------------------------------------------------


-# "build" - the type of system on which the package is being configured and compiled.
-ac_windows_build="no"
-ac_linux_build="no"
-case "${host}" in
-	*mingw*)
-		ac_windows_build="yes"
-		;;
-	*linux*)
-		ac_linux_build="yes"
-		;;
-esac
+# Non-standard feature checks

-# export to Makefile.am-s
-AM_CONDITIONAL([WINDOWS_BUILD], [test "$ac_windows_build" = "yes"])
-AM_CONDITIONAL([LINUX_BUILD], [test "$ac_linux_build" = "yes"])
-
-
-# "host" - the type of system on which the package runs. Specifying it enables the
-# cross-compilation mode. "target" defaults to this too.
-ac_windows_target="no"
-ac_linux_target="no"
-case "${target}" in
-	*mingw*)
-		ac_windows_target="yes"
-		;;
-	*linux*)
-		ac_linux_target="yes"
-		;;
-esac
-
-# export to Makefile.am-s
-AM_CONDITIONAL([WINDOWS_TARGET], [test "$ac_windows_target" = "yes"])
-AM_CONDITIONAL([LINUX_TARGET], [test "$ac_linux_target" = "yes"])
+# getrawpartition() for netbsd and openbsd in -lutil.
+AC_CHECK_LIB(util, getrawpartition, [ 	LIBS="$LIBS -lutil" ])


 # -------------------------------------------------------------------------------------
@@ -140,124 +146,11 @@ AM_CONDITIONAL([LINUX_TARGET], [test "$ac_linux_target" = "yes"])
 # -------------------------------------------------------------------------------------


-COMPILER_CXXFLAGS=""
-COMPILER_LDFLAGS=""
-# reset original user-supplied *FLAGS
-RESET_ORIGINAL="no"
-
-
-AC_ARG_ENABLE(default-gcc-options,
-	AS_HELP_STRING([--enable-default-gcc-options],[enable default compilation options (warnings, mostly) (GCC only) (default: disabled)]),
-	[default_gcc_options=${enableval}], [default_gcc_options=no])
-
-if test "$default_gcc_options" = "yes"; then
-	if test "$ac_windows_target" = "yes"; then
-		COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -mms-bitfields -mwindows"
-		COMPILER_LDFLAGS="$COMPILER_CXXFLAGS -mms-bitfields"
-	fi
-	COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS \
-Wall -Wcast-align -Wcast-qual -Wconversion \
-Wctor-dtor-privacy -Wfloat-equal -Wnon-virtual-dtor -Woverloaded-virtual \
-Wpointer-arith -Wshadow -Wsign-compare -Wsign-promo -Wundef -Wwrite-strings"
-	RESET_ORIGINAL="yes";
-fi
-
-
-AC_ARG_ENABLE(gcc-debug,
-	AS_HELP_STRING([--enable-gcc-debug],[enable debug build (GCC only) (default: disabled)]),
-	[gcc_debug=${enableval}], [gcc_debug=no])
-
-if test "$gcc_debug" = "yes"; then
-	COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -g3 -O0 -DDEBUG -DDEBUG_BUILD"
-	COMPILER_LDFLAGS="$COMPILER_LDFLAGS -g3 -O0"
-	RESET_ORIGINAL="yes";
-fi
-
-
-AC_ARG_ENABLE(gcc-optimize,
-	AS_HELP_STRING([--enable-gcc-optimize],[enable optimized build (GCC only) (default: disabled)]),
-	[gcc_optimize=${enableval}], [gcc_optimize=no])
-
-if test "$gcc_optimize" = "yes"; then
-	# Note: Do NOT put CPU flags here - they make the program non-portable.
-	if test "$ac_windows_target" = "yes"; then
-		COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -g0 -O3 -s"
-		COMPILER_LDFLAGS="$COMPILER_LDFLAGS -s"
-	else
-		COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -g0 -O3 -s -mtune=generic"
-		COMPILER_LDFLAGS="$COMPILER_LDFLAGS -s -mtune=generic"
-	fi
-	RESET_ORIGINAL="yes";
-fi
-
-
-AC_ARG_ENABLE(gcc_pch,
-	AS_HELP_STRING([--enable-gcc-pch],[enable precompiled header support (pch make target) (GCC only) (default: disabled)
-			(use "make gch" to speed up the compilation)]),
-	[gcc_pch=${enableval}], [gcc_pch=no])
-
-if test "$gcc_pch" = "yes"; then
-	COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Winvalid-pch -DENABLE_PCH"
-fi
-
-
-# define LINUX for linux target
-if test "$ac_linux_target" = "yes"; then
-	COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -DLINUX"
-fi
-
-
-# Reset user-supplied flags if one of the above options is present.
-# We append COMPILER_* counterparts in the end, to override any
-# previous options.
-if test "$RESET_ORIGINAL" = "yes"; then
-	CFLAGS=""
-	CXXFLAGS=""
-	LIBS=""
-	LDFLAGS=""
-fi
-
-
-# -------------------------------------------------------------------------------------
-
-# -------------------------------------------------------------------------------------
-
-
-# Enable compiler thread switches for known platforms.
-
-AC_MSG_NOTICE([checking thread support flags...])
-
-THREAD_CFLAGS=""
-THREAD_LIBS=""
-THREAD_FOUND="no"
-
-if test "$ac_windows_target" = "yes"; then
-	if test "$ax_cv_cxx_compiler_vendor" = "gnu"; then
-		THREAD_CFLAGS="-mthreads -D_THREAD_SAFE"
-		THREAD_LIBS="-mthreads"
-		THREAD_FOUND="yes"
-	fi
-
-elif test "$ac_linux_target" = "yes"; then
-	if test "$ax_cv_cxx_compiler_vendor" = "gnu" || test "$ax_cv_cxx_compiler_vendor" = "intel"; then
-		THREAD_CFLAGS="-pthread -D_MT -D_THREAD_SAFE"
-		THREAD_LIBS="-pthread"
-		THREAD_FOUND="yes"
-	elif test "$ax_cv_cxx_compiler_vendor" = "sun"; then
-		THREAD_CFLAGS="-mt"
-		THREAD_LIBS="-mt"
-		THREAD_FOUND="yes"
-	fi
-fi
-
-if test "$THREAD_FOUND" = "no"; then
-	AC_MSG_NOTICE([Cannot detect compiler thread support. Set CXXFLAGS and LDFLAGS manually.])
-
-else
-	AC_MSG_NOTICE([CFLAGS: $THREAD_CFLAGS;  LIBS: $THREAD_LIBS])
-	CXXFLAGS="$CXXFLAGS $THREAD_CFLAGS"
-	LIBS="$LIBS $THREAD_LIBS"
-fi
+# enable / disable compilation of tests
+AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests],
+		[enable compilation of test programs (default: no)]), [with_tests=${enableval}], [with_tests=no])
+# export to automake.am-s
+AM_CONDITIONAL([ENABLE_TESTS], [test "$with_tests" = "yes"])


 # -------------------------------------------------------------------------------------
@@ -272,8 +165,8 @@ pkg_modules="gtkmm-2.4 >= 2.6.0 gthread-2.0 >= 2.0"
 gtkmm_found="no"

 PKG_CHECK_MODULES([GTKMM], [$pkg_modules], [
-		AC_DEFINE([ENABLE_GLIB], [], [Whether GLib is installed])
-		AC_DEFINE([ENABLE_GLIBMM], [], [Whether GLibmm is installed])
+		AC_DEFINE([ENABLE_GLIB], [1], [Whether GLib is installed])
+		AC_DEFINE([ENABLE_GLIBMM], [1], [Whether GLibmm is installed])
 		gtkmm_found="yes"
 	], [
 		AC_MSG_WARN([$GTKMM_PKG_ERRORS])
@@ -290,68 +183,15 @@ PKG_CHECK_MODULES([GTKMM], [$pkg_modules], [
 CXXFLAGS="$GTKMM_CFLAGS $CXXFLAGS"
 LIBS="$GTKMM_LIBS $LIBS"

-# needed for in-code checks (AC_DEFINE() takes care of these above, no need of them here)
-# CXXFLAGS="$CXXFLAGS -DENABLE_GLIB -DENABLE_GLIBMM"

+# Detect libglade / gtkbuilder support

-# -------------------------------------------------------------------------------------
+APP_CHOOSE_GLD_READER([C++], [LIBGLADE_])

-# -------------------------------------------------------------------------------------
-
-
-gld_found=no;  # equals to "gtkbuilder" or "libglademm" after tests
-
-#if test "gtkmm_found" = "yes"; then
-
-	# Check whether we should use Gtk::Builder (gtkmm >= 2.12) or libglademm.
-	AC_ARG_ENABLE(libglademm, AS_HELP_STRING([--enable-libglademm],
-			[use libglademm instead of GtkBuilder (default: auto)]), [with_libglademm=${enableval}], [with_libglademm=auto])
-
-
-	# try gtkbuilder first
-	if test "$with_libglademm" = "no" || test "$with_libglademm" = "auto"; then
-		PKG_CHECK_EXISTS([gtkmm-2.4 >= 2.12.0], [gld_found=gtkbuilder])
-	fi
-	if test "$with_libglademm" = "no" && test "$gld_found" = "no"; then
-		AC_MSG_ERROR([GtkBuilder support not found (you need gtkmm version 2.12 or higher). Try using libglademm instead.])
-	fi
-
-	# libglade specified, or auto and no gtkbuilder. gtkmm2.4-compatible libglade is >= 2.4.0.
-	if test "$gld_found" = "no"; then
-		PKG_CHECK_MODULES([LIBGLADEMM], [libglademm-2.4 >= 2.4.0], [gld_found="libglademm"],
-				[AC_MSG_WARN([$LIBGLADEMM_PKG_ERRORS])])
-	fi
-	if test "$with_libglademm" = "yes" && test "$gld_found" = "no"; then
-		AC_MSG_ERROR([Libglademm not found. Try building with GtkBuilder support (you need gtkmm version 2.12 or higher).])
-	fi
-
-	# still not found.
-	if test "$gld_found" = "no"; then
-		AC_MSG_WARN([Neither GtkBuilder nor libglademm found. The program will be unable to compile fully.])
-	fi
-
-
-	AC_MSG_NOTICE([Glade file support through: $gld_found])
-
-	# merge libglademm flags
-	if test "$gld_found" = "libglademm"; then
-		CXXFLAGS="$LIBGLADEMM_CFLAGS $CXXFLAGS"
-		LIBS="$LIBGLADEMM_LIBS $LIBS"
-	fi
-
-#fi
-
-
-# export to automake.am-s
-AM_CONDITIONAL([ENABLE_LIBGLADEMM], [test "$gld_found" = "libglademm"])
-AM_CONDITIONAL([ENABLE_GTKBUILDER], [test "$gld_found" = "gtkbuilder"])
-
-# export to config.h
-if test "$gld_found" = "libglademm"; then
-	AC_DEFINE(ENABLE_LIBGLADEMM, 1, [Use libglademm instead of GtkBuilder])
-fi
-if test "$gld_found" = "gtkbuilder"; then
-	AC_DEFINE(ENABLE_GTKBUILDER, 1, [Use GtkBuilder instead of libglademm])
+if test "$app_cv_gld_reader" = "libglade"; then
+	CFLAGS="$CFLAGS $LIBGLADE_CFLAGS"
+	CXXFLAGS="$CXXFLAGS $LIBGLADE_CXXFLAGS"
+	LIBS="$LIBS $LIBGLADE_LIBS"
 fi


@@ -360,13 +200,27 @@ fi
 # -------------------------------------------------------------------------------------


-pkg_modules="libpcre"
+PCRE_CFLAGS="";
+PCRE_LIBS="";

-PKG_CHECK_MODULES(PCRE, [$pkg_modules])
+# try pkg-config first
+PKG_CHECK_MODULES(PCRE, [libpcre], [pcre_found=yes], [pcre_found=no])

-#CFLAGS="$PCRE_CFLAGS $CFLAGS"
-CXXFLAGS="$PCRE_CFLAGS $CXXFLAGS"
-LIBS="$PCRE_LIBS $LIBS"
+# if not found, try pcre-config (solaris had it but not pkg-config).
+if test "x$pcre_found" = "xno"; then
+	AC_PATH_PROG(pcre_config_binary, [pcre-config])
+	if test "x$pcre_config_binary" != "x"; then
+		PCRE_CFLAGS="`pcre-config --cflags`"
+		PCRE_LIBS="`pcre-config --libs`"
+	else
+		# AC_MSG_ERROR([Could not find pcre through pkg-config and pcre-config. Make sure the pcre libraries are installed])
+		AC_MSG_ERROR([$PCRE_PKG_ERRORS])
+	fi
+fi
+
+CFLAGS="$CFLAGS $PCRE_CFLAGS"
+CXXFLAGS="$CXXFLAGS $PCRE_CFLAGS"
+LIBS="$LIBS $PCRE_LIBS"


 # -------------------------------------------------------------------------------------
@@ -374,11 +228,36 @@ LIBS="$PCRE_LIBS $LIBS"
 # -------------------------------------------------------------------------------------


-# enable / disable compilation of tests
-AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests],
-		[enable compilation of test programs (default: no)]), [with_tests=${enableval}], [with_tests=no])
-# export to automake.am-s
-AM_CONDITIONAL([ENABLE_TESTS], [test "$with_tests" = "yes"])
+# Win32 distribution support (NSIS, zip)
+
+AC_ARG_WITH([nsis], [AS_HELP_STRING([--with-nsis],
+		[specify makensis.exe location to support making NSIS packages]
+		[ (default: ~/".wine/drive_c/Program Files/NSIS/makensis.exe")])],
+		[with_nsis=${withval}], [with_nsis=auto])
+
+AC_ARG_ENABLE([nsis-wine], [AS_HELP_STRING([--enable-nsis-wine],
+		[use wine to run makensis.exe when making NSIS packages (default: yes)])],
+		[with_nsis_wine=${enableval}], [with_nsis_wine=yes])
+
+AC_ARG_WITH([win32-env], [AS_HELP_STRING([--with-win32-env],
+		[specify location of win32 dlls when making win32 packages (default: /target/bin)])],
+		[with_win32_env=${withval}], [win_win32_env=auto])
+
+if test "x$with_nsis" = "xauto" || test "x$with_nsis" = "x"; then
+	with_nsis="~/\".wine/drive_c/Program Files/NSIS/makensis.exe\""
+fi
+if test "x$with_win32_env" = "xauto" || test "x$with_win32_env" = "x"; then
+	with_win32_env="/target/bin"
+fi
+
+NSIS_EXEC="$with_nsis";
+if test "x$with_nsis_wine" != "xno"; then
+	NSIS_EXEC="wine $with_nsis";
+fi
+WIN32_ENV="$with_win32_env";
+
+AC_SUBST(NSIS_EXEC)
+AC_SUBST(WIN32_ENV)


 # -------------------------------------------------------------------------------------
@@ -401,7 +280,7 @@ RES_DIST=""  # only files in "res" directory, EXTRA_DIST
 RES_TARGETS=""  # entry for each file in makefile

 RES_GLD_EXT="glade"
-if test "$gld_found" = "gtkbuilder"; then
+if test "$app_cv_gld_reader" = "gtkbuilder"; then
 	RES_GLD_EXT="ui"
 fi

@@ -468,7 +347,8 @@ _AM_SUBST_NOTMAKE([RES_TARGETS])
 # -------------------------------------------------------------------------------------


-# Export some configure variables as defines for the source code
+# Export some configure variables as defines for the source code.
+# Note: Autoconf manual says that AC_DEFINE won't work here.

 ADDITIONAL_FLAGS="-DPACKAGE_PKGDATA_DIR=\"\\\"\$(pkgdatadir)\\\"\" \
 -DPACKAGE_SYSCONF_DIR=\"\\\"\$(sysconfdir)\\\"\" \
@@ -478,10 +358,6 @@ ADDITIONAL_FLAGS="-DPACKAGE_PKGDATA_DIR=\"\\\"\$(pkgdatadir)\\\"\" \
 CXXFLAGS="$CXXFLAGS $ADDITIONAL_FLAGS"


-# -------------------------------------------------------------------------------------
-
-# -------------------------------------------------------------------------------------
-
 # Top src dir should always be in include path, before other includes.
 # Add global configuration file. Note: It must be searched in top_builddir
 # first (that's why -I is the first flag), for precompiled headers to work.
@@ -489,15 +365,20 @@ CXXFLAGS="$CXXFLAGS $ADDITIONAL_FLAGS"
 # Add pcrecpp too, because its files use #<file> on each other.
 ADDITIONAL_INCLUDES="-I\$(top_builddir) -I\$(top_srcdir)/src -I\$(top_srcdir)/src/pcrecpp"

-# -include doesn't work with sun and pgi, but works with intel and gcc.
-# we don't whitelist intel/gcc, because there are some gcc-frontend-based
-# compilers we don't want to break (pathscale, gccfss (gcc frontend / sun backend), etc...).
-if test "$ax_cv_cxx_compiler_vendor" != "sun" && test "$ax_cv_cxx_compiler_vendor" != "portland"; then
+# -include works with gcc, intel and pathscale, but doesn't work with sun and pgi.
+# Note: some gcc-frontend-based compilers may have to be added here
+# (e.g. gccfss (gcc frontend / sun backend), etc...).
+if test "$ax_cv_cxx_compiler_vendor" = "gnu" || test "$ax_cv_cxx_compiler_vendor" = "intel" \
+		|| test "$ax_cv_cxx_compiler_vendor" = "pathscale"; then
+	# This auto-includes this file when compiling any file. Benefits include pch support.
 	ADDITIONAL_INCLUDES="$ADDITIONAL_INCLUDES -include global_macros.h"
+else  # sun, pgi, others...
+	# This forces the file to be included manually.
+	ADDITIONAL_INCLUDES="$ADDITIONAL_INCLUDES -DHZ_NO_COMPILER_AUTOINCLUDE"
 fi

-#CFLAGS="$ADDITIONAL_INCLUDES $CFLAGS"
 # our flags must be before all the others
+#CFLAGS="$ADDITIONAL_INCLUDES $CFLAGS"
 CXXFLAGS="$ADDITIONAL_INCLUDES $CXXFLAGS"


@@ -506,23 +387,12 @@ CXXFLAGS="$ADDITIONAL_INCLUDES $CXXFLAGS"
 # -------------------------------------------------------------------------------------


-# Append compiler flags to CXXFLAGS, so that they override
-# whatever the user has set.
-CXXFLAGS="$CXXFLAGS $COMPILER_CXXFLAGS"
-LIBS="$LIBS $COMPILER_LDFLAGS"
+# final setup

 # This macro should be defined by ./configure automatically.
 # However, sometimes it's not (e.g. win32, why?), so we define it manually.
 CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H"

-
-# -------------------------------------------------------------------------------------
-
-
-# -------------------------------------------------------------------------------------
-
-# final setup
-
 #CFLAGS="$CFLAGS $USER_INCLUDES"
 #CXXFLAGS="$CXXFLAGS $USER_INCLUDES"
 #LIBS="$LIBS $USER_LDFLAGS"
@@ -535,6 +405,8 @@ AC_SUBST(LIBS)
 AC_SUBST(LDFLAGS)


+# -------------------------------------------------------------------------------------
+
 # -------------------------------------------------------------------------------------


@@ -551,11 +423,13 @@ AC_SUBST(LDFLAGS)



-# print'em out for debug purposes
+# print them out for debug purposes

 AC_MSG_NOTICE([
 CXXFLAGS:
 $CXXFLAGS
+LDFLAGS:
+$LDFLAGS
 LIBS:
 $LIBS
 ])
@@ -566,19 +440,30 @@ $LIBS
 AC_SUBST(AUTODIRS)


-# ----------------------------------------------------
+# -------------------------------------------------------------------------------------

-AC_CONFIG_FILES([ data/gsmartcontrol_gnome.desktop data/gsmartcontrol_kde.desktop \
-	data/gsmartcontrol_other.desktop \
+# -------------------------------------------------------------------------------------
+
+
+AC_CONFIG_FILES([ data/gsmartcontrol.desktop \
+	data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \
+	debian.dist/changelog \
+	src/gsc_winres.rc \
 	gsmartcontrol.spec version compilation_flags ])


+AC_CONFIG_FILES([data/gsmartcontrol-root], [chmod +x data/gsmartcontrol-root])
+
+
 # these are all the makefiles to generate

 AC_CONFIG_FILES([Makefile src/Makefile src/applib/Makefile src/res/Makefile src/hz/Makefile \
 	src/libdebug/Makefile src/pcrecpp/Makefile src/rconfig/Makefile src/rmn/Makefile \
 	data/Makefile data/16/Makefile data/22/Makefile data/24/Makefile data/32/Makefile \
-	data/48/Makefile data/64/Makefile data/128/Makefile])
+	data/48/Makefile data/64/Makefile data/128/Makefile data/256/Makefile data/nsis/Makefile \
+	debian.dist/Makefile])
+
+
 AC_OUTPUT


@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/256x256/apps
+appicon_DATA = gsmartcontrol.png
+
+EXTRA_DIST = $(appicon_DATA)
@@ -1,4 +1,5 @@
-SUBDIRS = 16 22 24 32 48 64 128
+
+SUBDIRS = 16 22 24 32 48 64 128 256 nsis

 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor

@@ -14,7 +15,7 @@ update-icon-cache:
 	fi


-# installs to /usr/share/appname
+# Application data, installs to /usr/share/appname
 appdatadir = $(pkgdatadir)
 appdata_DATA = icon_cddvd.png icon_hdd.png

@@ -22,15 +23,22 @@ appdata_DATA = icon_cddvd.png icon_hdd.png
 # pkgdatadir = $(datadir)/gsmartcontrol
 # pkgdata_DATA =

+# Desktop files
 desktopdir = $(datadir)/applications
-desktop_DATA = gsmartcontrol_gnome.desktop gsmartcontrol_kde.desktop \
-    gsmartcontrol_other.desktop
+desktop_DATA = gsmartcontrol.desktop


-# Same as 48/gsmartcontrol.png
+# Application pixmap (fallback icon for desktop files).
+# Same as 48/gsmartcontrol.png.
+# Also, xpm for debian menu, 32x32.
 pixmapsdir = $(datadir)/pixmaps
-pixmaps_DATA = 48/gsmartcontrol.png
+pixmaps_DATA = 48/gsmartcontrol.png gsmartcontrol.xpm


-EXTRA_DIST = $(appdata_DATA) $(pixmaps_DATA)
+# Put everything inside the distribution
+EXTRA_DIST = $(appdata_DATA) gsmartcontrol.ico gsmartcontrol.xpm
+
+
+bin_SCRIPTS = gsmartcontrol-root
+CLEANFILES = $(bin_SCRIPTS)

@@ -0,0 +1,111 @@
+#!/bin/bash
+############################################################################
+# Copyright:
+#      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+# License: See LICENSE_zlib.txt file
+############################################################################
+
+# Run gsmartcontrol with root, asking for root password first.
+
+EXEC_BIN="@prefix@/bin/gsmartcontrol";
+prog_name="gsmartcontrol"
+
+DESKTOP="$1";
+
+# This works for --help too
+if [ "$DESKTOP" = "" ]; then
+	DESKTOP="auto";  # default
+
+elif [ "$DESKTOP" != "auto" ] && [ "$DESKTOP" != "kde" ] && \
+		[ "$DESKTOP" != "gnome" ] && [ "$DESKTOP" != "other" ]; then
+	echo "Usage: $0 [<auto|kde|gnome|other> [<${prog_name}_options>] ]";
+	exit 1;
+fi
+shift;  # remove $1
+
+
+# Auto-detect current desktop if auto was specified.
+if [ "$DESKTOP" = "auto" ]; then
+	# KDE_SESSION_UID is present on kde3 and kde4.
+	# Note that it may be empty (but still set)
+	if [ "${KDE_SESSION_UID+set}" = "set" ]; then
+		DESKTOP="kde";
+	# same with gnome
+	elif [ "${GNOME_DESKTOP_SESSION_ID+set}" = "set" ]; then
+		DESKTOP="gnome";
+	else
+		DESKTOP="other";
+	fi
+fi
+
+# echo $DESKTOP;
+
+
+# They're basically the same, only the order is different.
+# sux requires xterm to ask for the password.
+# xdg-su is basically like this script, except worse :)
+gnome_sus="gnomesu gksu kdesu xdg-su sux";
+kde_sus="kdesu gnomesu gksu xdg-su sux";
+other_sus="$gnome_sus";
+
+
+candidates="";
+found_su=""
+
+if [ "$DESKTOP" = "gnome" ]; then
+	candidates="$gnome_sus";
+elif [ "$DESKTOP" = "kde" ]; then
+	candidates="$kde_sus";
+elif [ "$DESKTOP" = "other" ]; then
+	candidates="$other_sus";
+fi
+
+for subin in $candidates; do
+	which $subin &>/dev/null
+	if [ $? -eq 0 ]; then
+		found_su="$subin";
+		break;
+	fi
+done
+
+if [ "$found_su" = "" ]; then
+	xmessage "Error launching ${prog_name}: No suitable su mechanism found.
+Try installing kdesu, gnomesu, gksu or sux first.";
+	exit 1;
+fi
+
+
+# gnomesu and gksu (but not kdesu, not sure about others) fail to adopt
+# root's PATH. Since the user's PATH may not contain /usr/sbin (with smartctl)
+# on some distributions (e.g. mandriva), add it manually. We also add
+# /usr/local/sbin, since that's the default location of custom-compiled smartctl.
+# Add these directories _before_ existing PATH, so that the user is not
+# tricked into running it from some other path (we're running as root with
+# the user's env after all).
+export PATH="/usr/sbin:/usr/local/sbin:$PATH"
+
+
+# echo $found_su;
+
+# Examples:
+# gnomesu -c 'gsmartcontrol --no-scan'
+# kdesu -c 'gsmartcontrol --no-scan'
+# xterm -e sux -c 'gsmartcontrol --no-scan'  # sux asks for password in a terminal
+
+full_cmd=""
+if [ "$found_su" = "sux" ]; then
+	full_cmd="xterm -e sux -c '$EXEC_BIN $@'"
+
+elif [ "$found_su" = "gksu" ]; then
+	full_cmd="$found_su '$EXEC_BIN $@'"
+
+else  # gnomesu, kdesu, xdg-su
+	full_cmd="$found_su -c '$EXEC_BIN $@'"
+fi
+
+
+eval $full_cmd
+
+
+
+
@@ -1,14 +1,10 @@
 [Desktop Entry]

-# Desktop file for kde only.
-OnlyShowIn=KDE;
-
 # desktop file version
 Version=1.0
 Type=Application

-Categories=System;GTK;
-# Categories=Settings;HardwareSettings;
+Categories=System;Monitor;

 Name=GSmartControl
 # short description, usually shown in parentheses after Name
@@ -26,4 +22,8 @@ Icon=gsmartcontrol
 #X-KDE-SubstituteUID=true
 #X-KDE-RootOnly=true

-Exec=kdesu "@prefix@/bin/gsmartcontrol"
+# Run with root permissions.
+Exec="@prefix@/bin/gsmartcontrol-root"
+
+# Build service rpmlint gives errors without this
+X-SuSE-translate=false
@@ -0,0 +1,394 @@
+/* XPM */
+static char * gsmartcontrol_xpm[] = {
+"32 32 359 2",
+"  	c None",
+". 	c #ABAAAA",
+"+ 	c #CCCCCC",
+"@ 	c #C5C4C4",
+"# 	c #C2C1C1",
+"$ 	c #D2D1D1",
+"% 	c #C8C7C7",
+"& 	c #C8C7C8",
+"* 	c #C9C8C8",
+"= 	c #CAC8C9",
+"- 	c #CAC9C9",
+"; 	c #C8C6C7",
+"> 	c #C7C6C6",
+", 	c #CFCDCE",
+"' 	c #D1D0D0",
+") 	c #C6C5C6",
+"! 	c #CFCECE",
+"~ 	c #B9B7B7",
+"{ 	c #D4D4D4",
+"] 	c #DCDBDC",
+"^ 	c #D8D7D7",
+"/ 	c #D6D5D5",
+"( 	c #D6D5D6",
+"_ 	c #D7D6D6",
+": 	c #D9D8D8",
+"< 	c #DBDADB",
+"[ 	c #DAD9DA",
+"} 	c #D7D7D7",
+"| 	c #D6D6D6",
+"1 	c #DAD9D9",
+"2 	c #E2E1E1",
+"3 	c #B0AFAF",
+"4 	c #D3D2D2",
+"5 	c #CDCCCC",
+"6 	c #CDCDCD",
+"7 	c #CECDCD",
+"8 	c #CECECE",
+"9 	c #CFCFCF",
+"0 	c #D0CFCF",
+"a 	c #C0BFBF",
+"b 	c #9C9A9B",
+"c 	c #6E6B6B",
+"d 	c #807E7F",
+"e 	c #C8C8C8",
+"f 	c #CAC9CA",
+"g 	c #CACACA",
+"h 	c #CBCACA",
+"i 	c #CCCBCB",
+"j 	c #CCCBCC",
+"k 	c #D0CECF",
+"l 	c #C3C2C2",
+"m 	c #A09E9F",
+"n 	c #B5B4B4",
+"o 	c #AFADAE",
+"p 	c #787576",
+"q 	c #8D8B8B",
+"r 	c #D4D3D3",
+"s 	c #C7C6C7",
+"t 	c #C7C7C7",
+"u 	c #C9C8C9",
+"v 	c #C9C9C9",
+"w 	c #CACAC9",
+"x 	c #BFBEBE",
+"y 	c #A3A1A2",
+"z 	c #A09D9E",
+"A 	c #B4B2B2",
+"B 	c #B6B4B4",
+"C 	c #827F80",
+"D 	c #969595",
+"E 	c #C4C3C3",
+"F 	c #C4C4C4",
+"G 	c #C5C5C5",
+"H 	c #C6C5C5",
+"I 	c #C6C6C6",
+"J 	c #C9C7C8",
+"K 	c #B9B7B8",
+"L 	c #A5A4A4",
+"M 	c #A4A3A3",
+"N 	c #A7A5A5",
+"O 	c #B3B1B2",
+"P 	c #BFBDBD",
+"Q 	c #8D8A8B",
+"R 	c #A09F9F",
+"S 	c #DDDCDC",
+"T 	c #C0C0C0",
+"U 	c #C3C1C2",
+"V 	c #C3C2C3",
+"W 	c #C3C3C3",
+"X 	c #C4C3C4",
+"Y 	c #B2B1B1",
+"Z 	c #A8A7A7",
+"` 	c #ABA9A9",
+" .	c #CFCECF",
+"..	c #C2C0C1",
+"+.	c #989697",
+"@.	c #A8A6A7",
+"#.	c #DEDDDD",
+"$.	c #DEDDDE",
+"%.	c #C1C0C0",
+"&.	c #C2C1C2",
+"*.	c #B1B0B0",
+"=.	c #ADACAC",
+"-.	c #AFAEAE",
+";.	c #BDBCBC",
+">.	c #B3B2B2",
+",.	c #B4B3B4",
+"'.	c #B8B8B8",
+").	c #D5D4D4",
+"!.	c #C0BFBE",
+"~.	c #C1C0C1",
+"{.	c #C3C1C1",
+"].	c #C4C4C3",
+"^.	c #B2B0B1",
+"/.	c #B3B2B3",
+"(.	c #B4B3B3",
+"_.	c #A1A0A0",
+":.	c #B9B8B8",
+"<.	c #C4C2C3",
+"[.	c #BDBBBC",
+"}.	c #B5B4B3",
+"|.	c #B6B4B5",
+"1.	c #B7B5B6",
+"2.	c #B7B6B7",
+"3.	c #B8B7B7",
+"4.	c #B8B7B8",
+"5.	c #BCBABB",
+"6.	c #BBBABA",
+"7.	c #BFBEBF",
+"8.	c #C1C1C1",
+"9.	c #C1BFC0",
+"0.	c #BCBBBB",
+"a.	c #BEBCBD",
+"b.	c #BEBDBD",
+"c.	c #9B999A",
+"d.	c #9D9B9B",
+"e.	c #C2C2C2",
+"f.	c #D4D3D4",
+"g.	c #CECDCE",
+"h.	c #C7C5C5",
+"i.	c #A4A2A3",
+"j.	c #A19F9F",
+"k.	c #C6C4C5",
+"l.	c #DCDCDC",
+"m.	c #D0CFD0",
+"n.	c #CECCCD",
+"o.	c #A2A1A1",
+"p.	c #939292",
+"q.	c #E1E0E0",
+"r.	c #E3E3E3",
+"s.	c #B3B3B3",
+"t.	c #CCCACB",
+"u.	c #D2D2D2",
+"v.	c #D5D3D4",
+"w.	c #A7A6A6",
+"x.	c #959494",
+"y.	c #E3E2E2",
+"z.	c #DCDBDB",
+"A.	c #CBC9CA",
+"B.	c #E1E0E1",
+"C.	c #DFDEDE",
+"D.	c #CECCCC",
+"E.	c #CDCCCD",
+"F.	c #D2D0D0",
+"G.	c #D2D0D1",
+"H.	c #B5B4B5",
+"I.	c #B1AFB0",
+"J.	c #EDECEC",
+"K.	c #D1CFCF",
+"L.	c #CDCBCC",
+"M.	c #D5D5D5",
+"N.	c #DCDADA",
+"O.	c #C5C4C5",
+"P.	c #D2D1D2",
+"Q.	c #D5D4D5",
+"R.	c #DADADA",
+"S.	c #DBDADA",
+"T.	c #DDDCDD",
+"U.	c #D7D6D7",
+"V.	c #E8E7E7",
+"W.	c #D8D8D8",
+"X.	c #D8D6D6",
+"Y.	c #D9D8D9",
+"Z.	c #DBDBDB",
+"`.	c #DDDDDD",
+" +	c #474747",
+".+	c #ECEBEB",
+"++	c #F3F3F3",
+"@+	c #E4E3E3",
+"#+	c #E0DFDF",
+"$+	c #E5E5E5",
+"%+	c #EFEFEF",
+"&+	c #EBEAEB",
+"*+	c #E6E5E5",
+"=+	c #E0E0E0",
+"-+	c #E4E4E4",
+";+	c #E5E4E4",
+">+	c #ECECEC",
+",+	c #666666",
+"'+	c #585757",
+")+	c #D9D9DA",
+"!+	c #E2E2E2",
+"~+	c #E6E5E6",
+"{+	c #E1E1E1",
+"]+	c #E6E6E6",
+"^+	c #E7E7E7",
+"/+	c #898989",
+"(+	c #767575",
+"_+	c #E0DFE0",
+":+	c #E9E9E9",
+"<+	c #BDBDBD",
+"[+	c #B6B6B6",
+"}+	c #B0B0B0",
+"|+	c #ACACAC",
+"1+	c #ACABAC",
+"2+	c #A7A7A7",
+"3+	c #DFDFDF",
+"4+	c #E5E5E4",
+"5+	c #E9E8E8",
+"6+	c #E8E8E8",
+"7+	c #E3E2E3",
+"8+	c #D7D5D5",
+"9+	c #8E8D8D",
+"0+	c #807F7F",
+"a+	c #494848",
+"b+	c #5A5758",
+"c+	c #605E5F",
+"d+	c #646262",
+"e+	c #555354",
+"f+	c #1F1F1F",
+"g+	c #282626",
+"h+	c #323031",
+"i+	c #3D3C3C",
+"j+	c #494748",
+"k+	c #555353",
+"l+	c #5A5959",
+"m+	c #3E3D3D",
+"n+	c #434242",
+"o+	c #444343",
+"p+	c #414041",
+"q+	c #3E3E3E",
+"r+	c #4A4949",
+"s+	c #706D6E",
+"t+	c #6B6969",
+"u+	c #6A6869",
+"v+	c #696469",
+"w+	c #656065",
+"x+	c #595757",
+"y+	c #A5A5A5",
+"z+	c #767676",
+"A+	c #8A8888",
+"B+	c #4B4849",
+"C+	c #5C5A5A",
+"D+	c #686565",
+"E+	c #524F50",
+"F+	c #000000",
+"G+	c #090607",
+"H+	c #171415",
+"I+	c #262324",
+"J+	c #363334",
+"K+	c #454343",
+"L+	c #4A4748",
+"M+	c #212020",
+"N+	c #2A292A",
+"O+	c #2C2B2B",
+"P+	c #272626",
+"Q+	c #242424",
+"R+	c #242323",
+"S+	c #3C3B3B",
+"T+	c #726F70",
+"U+	c #6C696A",
+"V+	c #6B676A",
+"W+	c #7A916C",
+"X+	c #7B926B",
+"Y+	c #605F60",
+"Z+	c #9C9B9C",
+"`+	c #606060",
+" @	c #8F8D8D",
+".@	c #494747",
+"+@	c #595657",
+"@@	c #615E5F",
+"#@	c #656162",
+"$@	c #525050",
+"%@	c #020101",
+"&@	c #0C0A0A",
+"*@	c #1A1818",
+"=@	c #282525",
+"-@	c #454243",
+";@	c #494647",
+">@	c #2A2929",
+",@	c #393838",
+"'@	c #363536",
+")@	c #323131",
+"!@	c #2B292A",
+"~@	c #282727",
+"{@	c #444243",
+"]@	c #696666",
+"^@	c #666268",
+"/@	c #709D48",
+"(@	c #7BAD4A",
+"_@	c #68686A",
+":@	c #8F8E8F",
+"<@	c #4E4D4E",
+"[@	c #8E8C8D",
+"}@	c #484546",
+"|@	c #555253",
+"1@	c #5D595A",
+"2@	c #5F5B5C",
+"3@	c #514F50",
+"4@	c #0F0D0D",
+"5@	c #211E1F",
+"6@	c #312E2F",
+"7@	c #413D3E",
+"8@	c #222121",
+"9@	c #2E2D2D",
+"0@	c #312F30",
+"a@	c #262425",
+"b@	c #464344",
+"c@	c #696667",
+"d@	c #666263",
+"e@	c #5F5E5F",
+"f@	c #5A5B5B",
+"g@	c #797577",
+"h@	c #7A7A7A",
+"i@	c #4C4A4A",
+"j@	c #2A2728",
+"k@	c #2C292A",
+"l@	c #302D2E",
+"m@	c #312F2F",
+"n@	c #2E2C2C",
+"o@	c #100F0F",
+"p@	c #110F10",
+"q@	c #141212",
+"r@	c #1B1919",
+"s@	c #242222",
+"t@	c #2D2B2B",
+"u@	c #322F30",
+"v@	c #2F2D2D",
+"w@	c #2B2829",
+"x@	c #292728",
+"y@	c #363233",
+"z@	c #332F30",
+"A@	c #312D2F",
+"B@	c #2A2627",
+"C@	c #424040",
+"D@	c #454444",
+"E@	c #737373",
+"F@	c #828282",
+"G@	c #939293",
+"H@	c #9C9C9C",
+"I@	c #A3A3A3",
+"J@	c #A9A9A9",
+"K@	c #ADADAD",
+"L@	c #B2B2B2",
+"M@	c #B5B5B5",
+"N@	c #A4A4A4",
+"O@	c #959595",
+"P@	c #8C8C8C",
+"Q@	c #707070",
+"R@	c #FFFFFF",
+"                                                                ",
+"        . + @ # $ % & * = - ; > * - - - * , ' ) ! ~             ",
+"        = { ' ] ^ { / / ( _ : < [ ^ ^ } ^ | 1 2 } 3             ",
+"        - 4 ' ' 5 6 6 6 7 7 8 9 ! ! 9 9 0 0 $ 5 a b c           ",
+"      d 4 [ * e - - f g h h h i i j + 5 5 k l m n o p           ",
+"      q _ r @ > > s s t % % * * u v - w 5 x y z A B C           ",
+"      D 1 7 l E F @ @ G H H I > > > J * K L M N O P Q           ",
+"      R S % T U U l V W E X F @ @ > E Y Z ` >  .* ..+.          ",
+"      @.#.$.W %.# # # &.l l V E G T *.=.-.*.5 ;.>.,.Z           ",
+"      n '.).[ !.T ~.# ..{.U l ].x Y ^.>.A /.(.x ;.O _.          ",
+"      :.^.<.h a %.%.# # # &.U [.}.|.1.2.3.4.K K a 5.N           ",
+"      6.i H 7.%.8.# &.# l * % E 9.[.5.0.[.;.a.b.;., %.c.        ",
+"    d.> 0 a # &.e.V V % ^ f.j g - % %.....&.l V l g.h.i.        ",
+"    j./ i # E E @ k.H l.g.%.# l E H <.b.; > % % % m.n.o.        ",
+"    p.q.7 @ ) > % % - r.) > % * * g f s.5 t.i i i u.v.w.        ",
+"    x.y.z.> u - g A.- B.C.D.E.! 0 7 (.6.$ ' ' F.G.).^ H.        ",
+"    I.7 J.K.L.7 7 ! ! m.S 1 m.- %.3.8./ ).M./ | _ : N.;         ",
+"    O., F.f.P.4 4 4 f.f.r / Q.4 4 ^ R.: : 1 [ S.< S T.U.        ",
+"    4 V.| ).| _ W._ X.^ : Y.1 S.Z.z.] S S `.#.C.C.2 V.q. +      ",
+"    S..+++@+`.#+$+%+&+*+2 #+=+q.y.-+-+-+;+$+$+*+>+++Z.*+,+      ",
+"  '+S.# $ >+r.m.e.# 6 )+!+~+*+@+B.=+{+-+]+]+^+]+^+j 5 y./+      ",
+"  (+b.3 _+! m.#+:+q.r > <+[+}+|+3 '.b.8.> e 5 7 ! ^+j 1+2+      ",
+"  x.] ! r / ^ W.R.S 3+2 y.@+4+5+6+^+~+*+;+7+#+C.#.S.8+: V       ",
+"  9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+n+p+q+r+s+t+u+v+w+x+y+      ",
+"  z+A+B+C+d+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+      ",
+"  `+ @.@+@@@#@$@%@&@*@=@J+-@;@>@,@'@)@!@~@{@c ]@^@/@(@_@:@      ",
+"  <@[@}@|@1@2@3@F+%@4@5@6@7@-@8@9@9@0@~@a@b@c@#@d@e@f@g@h@      ",
+"    i@j@k@l@m@n@o@p@q@r@s@t@u@!@l@v@v@w@x@l@y@z@6@A@B@C@D@      ",
+"            E@F@G@H@I@J@K@}+L@M@M@M@s.}+|+N@H@O@P@F@Q@          ",
+"                        R@R@R@R@R@R@R@R@R@                      ",
+"                                                                ",
+"                                                                "};
@@ -0,0 +1,2 @@
+
+EXTRA_DIST = distribution.txt.in gsmartcontrol.nsi.in nsi_install.ico nsi_uninstall.ico
@@ -0,0 +1,28 @@
+
+GSmartControl - Hard disk drive health inspection tool
+Version @VERSION@
+
+The latest version of this distribution, as well as the source code of
+GSmartControl, can be found at
+http://gsmartcontrol.berlios.de
+and
+http://developer.berlios.de/project/showfiles.php?group_id=10075
+
+You need GTK+ for Windows Runtime package to use this program. You can get one
+at http://gtk-win.sf.net (you must download at least version 2.14.4-2008-11-11
+of gtk2-runtime).
+
+
+This distribution includes:
+
+* GSmartControl binary (gsmartcontrol.exe) and associated resources. The
+binary was compiled for 32-bit Windows, and should work on both 32-bit and
+64-bit Windows.
+
+* Gtkmm (http://www.gtkmm.org/) dlls.
+
+* PCRE (http://www.pcre.org/) dll.
+
+* Smartctl binaries - smartctl.exe (compiled without console output),
+smartctl_console.exe (compiled with console output), version 5.38.
+http://smartmontools.sf.net/ .
@@ -0,0 +1,293 @@
+
+; NSIS2 Script
+; Compatible with NSIS 2.40
+
+
+!define PRODUCT_VERSION "@VERSION@"
+!define PRODUCT_NAME "GSmartControl"
+!define PRODUCT_NAME_SMALL "gsmartcontrol"
+!define PRODUCT_PUBLISHER "Alexander Shaduri"
+!define PRODUCT_WEB_SITE "http://gsmartcontrol.berlios.de"
+
+;!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\AppMainExe.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+!define REGISTRY_APP_PATHS "Software\Microsoft\Windows\CurrentVersion\App Paths"
+
+
+
+
+; --------------- General Settings
+
+
+; This compressor gives us the best results
+SetCompressor /SOLID lzma
+
+; Do a CRC check before installing
+CRCCheck On
+
+; This is used in titles
+Name "${PRODUCT_NAME}"  ;  ${PRODUCT_VERSION}
+
+; Output File Name
+OutFile "${PRODUCT_NAME_SMALL}-${PRODUCT_VERSION}.exe"
+
+
+
+;The Default Installation Directory
+; try to install to the same directory as runtime.
+InstallDir "$PROGRAMFILES\${PRODUCT_NAME_SMALL}"
+; If already installed, try here
+InstallDirRegKey HKLM "SOFTWARE\${PRODUCT_NAME}" "InstallationDirectory"
+
+
+ShowInstDetails show
+ShowUnInstDetails show
+
+
+
+
+
+; --------------------- MUI INTERFACE
+
+; MUI 2.0 compatible install
+!include "MUI2.nsh"
+
+;Backgound Colors. uncomment to enable fullscreen.
+; BGGradient 0000FF 000000 FFFFFF
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "nsi_install.ico"
+!define MUI_UNICON "nsi_uninstall.ico"
+
+
+;Things that need to be extracted on first (keep these lines before any File command!)
+;Only useful for BZIP2 compression
+!insertmacro MUI_RESERVEFILE_LANGDLL
+;!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+
+; Language Selection Dialog Settings
+!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
+
+
+; Pages to show during installation
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "doc\distribution.txt"
+;!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+;!define MUI_FINISHPAGE_RUN "$INSTDIR\gsmartcontrol.exe"
+;!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\Example.file"
+;!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_FINISHPAGE_NOREBOOTSUPPORT
+!insertmacro MUI_PAGE_FINISH
+
+
+
+; Uninstaller page
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+
+; --------------- END MUI
+
+LangString TEXT_IO_TITLE ${LANG_ENGLISH} "GSmartControl"
+
+
+
+; --------------- START INSTALLATION
+
+
+Function .onInit
+
+  !insertmacro MUI_LANGDLL_DISPLAY
+
+  Push 2 ;F ;22 = number of languages, F = change font
+
+  ;Language selection
+  LangDLL::LangDialog "Installer Language" "Please select a language."
+
+  Pop $LANGUAGE
+  StrCmp $LANGUAGE "cancel" 0 +2
+  Abort
+
+    ; detect previous installation
+	ReadRegStr $R0 HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
+	StrCmp $R0 "" no_prev
+
+	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+		"${PRODUCT_NAME} is already installed. $\n$\nClick 'OK' to remove the \
+		previous version or 'Cancel' to continue anyway." \
+		IDOK uninst_product
+		; Abort
+	goto no_prev ; if cancel was pressed, continue as if no old installation.
+
+    ;Run the uninstaller
+    uninst_product:
+    ClearErrors
+    ExecWait '$R0 _?=$INSTDIR'  ;Do not copy the uninstaller to a temp file
+
+    IfErrors cannot_uninst_product
+
+    ;You can either use Delete /REBOOTOK in the uninstaller or add some code
+    ;here to remove the uninstaller. Use a registry key to check
+    ;whether the user has chosen to uninstall. If you are using an uninstaller
+    ;components page, make sure all sections are uninstalled.
+    cannot_uninst_product:
+
+    no_prev: ; no old installation found, all ok
+
+
+
+
+	; detect GTK installation (any of available versions)
+	ReadRegStr $R0 HKLM "SOFTWARE\GTK\2.0" "DllPath"
+	StrCmp $R0 "" no_gtk
+
+	goto have_gtk
+
+	no_gtk:
+	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+	"GTK2-Runtime is not installed. This product needs it to function properly.$\n\
+	Please install GTK2-Runtime from http://gtk-win.sf.net/ first.$\n$\n\
+	Click 'Cancel' to abort the installation \
+	or 'OK' to continue anyway." \
+	IDOK have_gtk
+	Abort
+
+	have_gtk:
+	; do nothing
+
+
+
+FunctionEnd
+
+
+
+
+; ----------------- INSTALLATINO TYPES
+
+; InstType "Recommended"
+InstType "Full"
+;InstType "Minimal"
+
+
+
+
+
+
+Section "Main" SecMain
+SectionIn 1
+  SetOutPath "$INSTDIR"
+
+  SetOverwrite Off ; don't overwrite the config file
+;  File "gsmartcontrol.conf"
+
+  SetOverwrite On
+  File gsmartcontrol.exe
+  File gsmartcontrol.ico
+  File icon_*.png
+  File *.dll
+  File smartctl.exe
+  File smartctl_console.exe
+
+  File /r doc
+
+  ; set a special path for this exe, as GTK may not be in a global path.
+  ReadRegStr $R3 HKLM "SOFTWARE\GTK\2.0" "DllPath"
+  WriteRegStr HKLM "${REGISTRY_APP_PATHS}\gsmartcontrol.exe" "Path" "$R3"
+
+  ;Add Shortcuts
+  CreateShortCut "$SMPROGRAMS\GSmartControl.lnk" "$INSTDIR\gsmartcontrol.exe" "" "$INSTDIR\gsmartcontrol.ico" 0
+
+SectionEnd
+
+
+
+; ------------------ POST INSTALL
+
+
+!define TEMP $R0
+
+Section -post
+
+  WriteRegStr HKLM "SOFTWARE\${PRODUCT_NAME}" "InstallationDirectory" "$INSTDIR"
+  WriteRegStr HKLM "SOFTWARE\${PRODUCT_NAME}" "Vendor" "Alexander Shaduri"
+
+  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME}"
+  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\gsmartcontrol_uninst.exe"
+
+  ; We don't need this, MUI takes care for us
+  WriteRegStr HKCU "Software\${PRODUCT_NAME}" "Installer Language" $LANGUAGE
+
+  ; uninstall shortcut
+;  CreateDirectory "$SMPROGRAMS\GSmartControl"
+;  CreateShortCut "$SMPROGRAMS\GSmartControl\Uninstall GSmartControl.lnk" "$INSTDIR\gsmartcontrol_uninst.exe" "" ""
+
+
+  ; write out uninstaller
+  WriteUninstaller "$INSTDIR\gsmartcontrol_uninst.exe"
+
+SectionEnd ; post
+
+
+
+
+
+; ---------------- UNINSTALL
+
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+
+
+
+Section Uninstall
+
+  SetAutoClose false
+
+  ; add delete commands to delete whatever files/registry keys/etc you installed here.
+  Delete "$INSTDIR\gsmartcontrol_uninst.exe"
+
+  DeleteRegKey HKLM "SOFTWARE\${PRODUCT_NAME}"
+  DeleteRegKey HKLM "${PRODUCT_UNINST_KEY}"
+
+  Delete "$INSTDIR\gsmartcontrol.exe"
+  Delete "$INSTDIR\gsmartcontrol.ico"
+  Delete "$INSTDIR\icon_*.png"
+  Delete "$INSTDIR\*.dll"
+  Delete "$INSTDIR\smartctl.exe"
+  Delete "$INSTDIR\smartctl_console.exe"
+
+  RMDir /r "$INSTDIR\doc"
+
+  RMDir "$INSTDIR"  ; only if empty
+
+  DeleteRegKey HKLM "${REGISTRY_APP_PATHS}\gsmartcontrol.exe"
+
+  Delete "$SMPROGRAMS\GSmartControl.lnk"
+;  Delete "$SMPROGRAMS\GSmartControl\Uninstall GSmartControl.lnk"
+
+
+SectionEnd ; end of uninstall section
+
+
+
+
+; eof
@@ -0,0 +1,7 @@
+
+noinst_DATA = changelog.in compat control copyright docs menu postinst \
+	postrm rules
+
+# include the generated file too
+EXTRA_DIST=changelog.in changelog compat control copyright docs menu postinst \
+	postrm rules
@@ -0,0 +1,5 @@
+gsmartcontrol (0.8.2+nmu1) unstable; urgency=low
+
+  * Permanently Initial Release.
+
+ -- Alexander Shaduri <ashaduriREMOVETHIS@gmail.com>  Sat, 15 Nov 2008 00:12:04 +0400
@@ -0,0 +1,5 @@
+gsmartcontrol (@VERSION@+nmu1) unstable; urgency=low
+
+  * Permanently Initial Release.
+
+ -- Alexander Shaduri <ashaduriREMOVETHIS@gmail.com>  Sat, 15 Nov 2008 00:12:04 +0400
@@ -0,0 +1 @@
+5
@@ -0,0 +1,22 @@
+Source: gsmartcontrol
+Section: utils
+Priority: extra
+Homepage: http://gsmartcontrol.berlios.de/
+Maintainer: Alexander Shaduri <ashaduriREMOVETHIS@gmail.com>
+# technically, we don't need libglademm if gtkmm >= 2.12, but it won't get
+# into Depends if it's not needed, so let's leave it here.
+Build-Depends: debhelper (>= 5), autotools-dev,
+ libpcre3-dev, libgtkmm-2.4-dev (>= 2.6.0), libglademm-2.4-dev
+Standards-Version: 3.7.3
+
+Package: gsmartcontrol
+Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}, smartmontools
+Depends: ${shlibs:Depends}, smartmontools
+Description: Hard disk drive health inspection tool
+ GSmartControl is a graphical user interface for smartctl (from smartmontools
+ package, see http://smartmontools.sourceforge.net), which is a tool for
+ querying and controlling SMART (Self-Monitoring, Analysis, and Reporting
+ Technology) data on modern hard disk drives. It allows you to inspect the
+ drive's SMART data to determine its health, as well as run various tests on
+ it.
@@ -0,0 +1,32 @@
+This package was debianized by Alexander Shaduri <ashaduri 'at' gmail.com> on
+Sat, 15 Nov 2008 00:12:04 +0400.
+
+It was downloaded from <http://gsmartcontrol.berlios.de/>
+
+Copyright:
+
+    Copyright (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
+
+License:
+
+This product is multi-licensed under GNU GPL versions 2 and 3.
+You are free to choose which one you use.
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of either version 2 or (at your option) version 3 of the GNU General
+Public License as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE. See the GNU General Public Licenses for more details.
+
+You should have received copies of these licenses along with this program.
+If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public Licenses can be found in `/usr/share/common-licenses/GPL-2' and
+`/usr/share/common-licenses/GPL-3'.
+
+The Debian packaging is (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com> and
+is licensed under the GPLv2 and GPLv3, see above.
+
@@ -0,0 +1,12 @@
+AUTHORS.txt
+LICENSE_boost_1_0.txt
+LICENSE_bsd-ucb.txt
+LICENSE_gpl2.txt
+LICENSE_gpl3.txt
+LICENSE_gsmartcontrol.txt
+LICENSE_hz.txt
+LICENSE_pcrecpp.txt
+LICENSE_whatever.txt
+LICENSE_zlib.txt
+NEWS
+README.txt
@@ -0,0 +1,4 @@
+?package(gsmartcontrol):needs="X11" section="Applications/System/Hardware"\
+  title="GSmartControl" command="/usr/bin/gsmartcontrol-root"\
+  longtitle="Hard Disk Health Inspection"\
+  icon="/usr/share/pixmaps/gsmartcontrol.xpm"
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if test -x /usr/bin/update-menus; then update-menus; fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if test -x /usr/bin/update-menus; then update-menus; fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
@@ -0,0 +1,98 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure --enable-optimize-options=auto --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/gsmartcontrol.sgml > gsmartcontrol.1
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/gsmartcontrol.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/gsmartcontrol install-strip
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+#	dh_installexamples
+#	dh_install
+	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
@@ -1,10 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 ############################################################################
 # Copyright:
 #      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
 # License: See LICENSE_zlib.txt file
 ############################################################################

+# We use #!/bin/bash of #!/bin/sh because freebsd (tested with 6.3) in its
+# infinite wisdom has csh-like /bin/sh (even though the SUS says it
+# must be bourne-compatible).
+

 if [ "$1" == "" ] | [ "$2" == "" ] | [ "$3" == "" ]; then
 	echo "Usage: $0 <input_file> <cpp_file> <symbol_name>";
@@ -66,7 +66,7 @@
        <cflags/>
        <cxxflags/>
        <envvars/>
-        <configargs>--enable-default-gcc-options --enable-gcc-optimize --enable-gcc-pch --enable-tests</configargs>
+        <configargs>--disable-user-flags --enable-optimize-options --enable-tests</configargs>
        <topsourcedir/>
        <cppflags/>
        <ldflags/>
@@ -76,7 +76,7 @@
        <f77flags/>
      </optimized>
      <debuggy>
-        <configargs>--enable-default-gcc-options --enable-gcc-debug --enable-tests</configargs>
+        <configargs>--disable-user-flags --enable-debug-options --enable-tests</configargs>
        <builddir>debuggy</builddir>
        <ccompiler>kdevgccoptions</ccompiler>
        <cxxcompiler>kdevgppoptions</cxxcompiler>
@@ -94,24 +94,24 @@
      </debuggy>
      <icc>
        <envvars/>
-        <configargs>--disable-default-gcc-options --enable-tests</configargs>
+        <configargs>--disable-user-flags --enable-tests</configargs>
        <builddir>icc</builddir>
        <topsourcedir/>
        <cppflags/>
-        <ldflags>-s -static-libgcc -static-intel</ldflags>
+        <ldflags/>
        <ccompiler>kdevgccoptions</ccompiler>
        <cxxcompiler>kdevgppoptions</cxxcompiler>
        <f77compiler>kdevg77options</f77compiler>
        <ccompilerbinary>icc</ccompilerbinary>
        <cxxcompilerbinary>icpc</cxxcompilerbinary>
        <f77compilerbinary/>
-        <cflags>-w1</cflags>
-        <cxxflags>-g0 -O3 -m32 -ftrapuv -fstack-security-check -early-template-check -static-libgcc -static-intel -Wcomment -Wdeprecated -Wextra-tokens -Wformat -Wmissing-prototypes -Wnon-virtual-dtor -Wpointer-arith -Wreturn-type -Wshadow -Wtrigraphs -Wuninitialized -w1</cxxflags>
+        <cflags/>
+        <cxxflags/>
        <f77flags/>
      </icc>
      <win32>
        <envvars/>
-        <configargs>--enable-default-gcc-options --enable-gcc-optimize --enable-gcc-pch --enable-tests --target=i386-mingw32msvc --host=i386-mingw32msvc --build=i686-linux PKG_CONFIG_PATH=/target/lib/pkgconfig PKG_CONFIG_LIBDIR=/target/lib PATH=&quot;/opt/cross-tools/bin:/target/bin:$PATH&quot;</configargs>
+        <configargs>--disable-user-flags --enable-optimize-options --enable-tests --target=i386-mingw32msvc --host=i386-mingw32msvc --build=i686-linux PKG_CONFIG_PATH=/target/lib/pkgconfig PKG_CONFIG_LIBDIR=/target/lib PATH=&quot;/opt/cross-tools/bin:/target/bin:$PATH&quot;</configargs>
        <builddir>win32</builddir>
        <topsourcedir/>
        <cppflags/>
@@ -119,8 +119,8 @@
        <ccompiler>kdevgccoptions</ccompiler>
        <cxxcompiler>kdevgppoptions</cxxcompiler>
        <f77compiler>kdevg77options</f77compiler>
-        <ccompilerbinary>&quot;i386-mingw32msvc-gcc -mms-bitfields&quot;</ccompilerbinary>
-        <cxxcompilerbinary>&quot;i386-mingw32msvc-g++ -mms-bitfields&quot;</cxxcompilerbinary>
+        <ccompilerbinary>i386-mingw32msvc-gcc</ccompilerbinary>
+        <cxxcompilerbinary>i386-mingw32msvc-g++</cxxcompilerbinary>
        <f77compilerbinary/>
        <cflags/>
        <cxxflags/>
@@ -130,7 +130,7 @@
        <envvars>
          <envvar value="/opt/sun/sunstudio12/bin:$PATH" name="PATH" />
        </envvars>
-        <configargs>--disable-default-gcc-options --enable-tests</configargs>
+        <configargs>--enable-tests</configargs>
        <builddir>suncc</builddir>
        <topsourcedir/>
        <cppflags/>
@@ -141,8 +141,8 @@
        <ccompilerbinary>suncc</ccompilerbinary>
        <cxxcompilerbinary>sunCC</cxxcompilerbinary>
        <f77compilerbinary/>
-        <cflags>-DDEBUG -DDEBUG_BUILD</cflags>
-        <cxxflags>+w -errtags -erroff=notemsource,notused -features=extensions -DHZ_FORCE_GLOBAL_MACROS -DDEBUG -DDEBUG_BUILD -DGLIBMM_HAVE_SUN_REVERSE_ITERATOR -DSIGC_HAVE_SUN_REVERSE_ITERATOR</cxxflags>
+        <cflags>-errwarn=%all</cflags>
+        <cxxflags>-DGLIBMM_HAVE_SUN_REVERSE_ITERATOR -DSIGC_HAVE_SUN_REVERSE_ITERATOR</cxxflags>
        <f77flags/>
      </suncc>
      <portland>
@@ -151,7 +151,7 @@
        <builddir>portland</builddir>
        <topsourcedir/>
        <cppflags/>
-        <ldflags/>
+        <ldflags>-s</ldflags>
        <ccompiler>kdevgccoptions</ccompiler>
        <cxxcompiler>kdevgppoptions</cxxcompiler>
        <f77compiler>kdevg77options</f77compiler>
@@ -159,9 +159,26 @@
        <cxxcompilerbinary>pgCC</cxxcompilerbinary>
        <f77compilerbinary/>
        <cflags>-Minform=warn -Bstatic_pgi</cflags>
-        <cxxflags>-Minform=warn -Bstatic_pgi -noswitcherror -define_macro=HZ_FORCE_GLOBAL_MACROS</cxxflags>
+        <cxxflags>-Minform=warn -Bstatic_pgi -noswitcherror -define_macro=HZ_NO_COMPILER_AUTOINCLUDE</cxxflags>
        <f77flags/>
      </portland>
+      <win32-debug>
+        <envvars/>
+        <configargs>--disable-user-flags --enable-debug-options --enable-tests --target=i386-mingw32msvc --host=i386-mingw32msvc --build=i686-linux PKG_CONFIG_PATH=/target/lib/pkgconfig PKG_CONFIG_LIBDIR=/target/lib PATH=&quot;/opt/cross-tools/bin:/target/bin:$PATH&quot;</configargs>
+        <builddir>win32-debug</builddir>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevg77options</f77compiler>
+        <ccompilerbinary>i386-mingw32msvc-gcc</ccompilerbinary>
+        <cxxcompilerbinary>i386-mingw32msvc-g++</cxxcompilerbinary>
+        <f77compilerbinary/>
+        <cflags/>
+        <cxxflags/>
+        <f77flags/>
+      </win32-debug>
    </configurations>
    <make>
      <envvars>
@@ -0,0 +1,144 @@
+Name:		gsmartcontrol
+Version:	@VERSION@
+Release:	1as
+License:	GPLv2, GPLv3
+Url:		http://gsmartcontrol.berlios.de
+Vendor:		Alexander Shaduri <ashaduri 'at' gmail.com>
+Packager:	Alexander Shaduri <ashaduri 'at' gmail.com>
+Source:		gsmartcontrol-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+Summary:	GSmartControl - Hard Disk Health Inspection Tool
+
+%if 0%{?mandriva_version}
+Group:		System/Kernel and hardware
+%else
+Group:		Hardware/Other
+%endif
+
+# Support build service rpmlint. Disabled - the build service
+# stopped recognizing the flag for some architectures.
+# %if 0%{?opensuse_bs} && 0%{?suse_version} >= 1010
+# Support: rpmlint-bs
+# %endif
+
+
+# Dependencies for various distributions. The actual deps are:
+# smartmontools, pcre, (gtkmm2 >= 2.12 || (gtkmm2 >= 2.6.0 && libglademm >= 2.4.0))
+# (with the respective -devel packages of the libraries for build requirements).
+# For non-specified distributions we don't specify any dependencies to avoid errors.
+
+# For mandriva, these contain the su programs.
+# Suggests:	libgnomesu, gksu, kdebase-progs
+
+
+# SUSE / OpenSUSE. SLES also defines the correct suse_version.
+%if 0%{?suse_version}
+
+%if 0%{?%suse_version} >= 1030
+Requires: smartmontools, pcre, gtkmm2 >= 2.12.0
+BuildRequires: gcc-c++, libstdc++-devel, pcre-devel, gtkmm2-devel >= 2.12.0
+%else
+Requires: smartmontools, pcre, gtkmm2 >= 2.6.0, libglademm >= 2.4.0
+BuildRequires: gcc-c++, libstdc++-devel, pcre-devel, gtkmm2-devel >= 2.6.0, libglademm-devel >= 2.4.0
+%endif
+
+%endif
+
+
+# Fedora, CentOS, RHEL
+%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+
+# I'm not sure about centos and rhel versions
+%if 0%{?fedora_version} >= 8 || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+Requires: smartmontools, pcre, gtkmm24 >= 2.12.0
+BuildRequires: gcc-c++, pcre-devel, gtkmm24-devel >= 2.12.0
+%else
+Requires: smartmontools, pcre, gtkmm24 >= 2.6.0, libglademm24 >= 2.4.0
+BuildRequires: gcc-c++, pcre-devel, gtkmm24-devel >= 2.6.0, libglademm24-devel >= 2.4.0
+%endif
+
+%endif
+
+
+# Mandriva
+%if 0%{?mandriva_version}
+
+%if 0%{?mandriva_version} >= 2008
+Requires: smartmontools, libpcre0, gtkmm2.4 >= 2.12.0
+BuildRequires: gcc-c++, gcc-cpp, pcre-devel, gtkmm2.4-devel >= 2.12.0, desktop-file-utils
+%else
+Requires: smartmontools, libpcre0, gtkmm2.4 >= 2.6.0, libglademm2.4 >= 2.4.0
+BuildRequires: gcc-c++, gcc-cpp, pcre-devel, gtkmm2.4-devel >= 2.6.0, libglademm2.4-devel >= 2.4.0, desktop-file-utils
+%endif
+
+%endif
+
+
+%description
+GSmartControl is a graphical user interface for smartctl, which is a tool for
+querying and controlling SMART (Self-Monitoring, Analysis, and Reporting
+Technology) data in hard disk drives. It allows you to inspect the drive's
+SMART data to determine its health, as well as run various tests on it.
+
+%prep
+
+
+%setup -q
+%configure --enable-optimize-options=auto
+
+
+%build
+# Set up for parallel builds
+numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
+if [ "$numprocs" = "0" ]; then
+	numprocs=1
+fi
+
+make -j$numprocs
+# make
+
+
+%install
+# %makeinstall
+make DESTDIR=%buildroot install-strip
+
+%if 0%{?mandriva_version}
+desktop-file-install --vendor="" \
+	--remove-category="Application" \
+	--add-category="System" \
+	--add-category="X-MandrivaLinux-System-Configuration-Hardware;Settings;HardwareSettings" \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%endif
+
+
+%clean
+rm -rf %buildroot
+
+
+%files
+%defattr(-,root,root)
+
+%attr(0755,root,root) %{_bindir}/*
+# %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/*
+
+%doc %{_datadir}/doc/gsmartcontrol
+
+%{_datadir}/gsmartcontrol
+# %{_datadir}/gsmartcontrol/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/*
+%{_datadir}/pixmaps/*
+
+
+
+%changelog
+* Fri Nov 14 2008 Alexander Shaduri <ashaduri 'at' gmail.com>
+- Updated .spec file to incorporate changes from the official Mandriva package.
+
+* Mon Oct 06 2008 Alexander Shaduri <ashaduri 'at' gmail.com>
+- Updated .spec file to support OpenSUSE < 10.3, Fedora and friends,
+	Mandriva (for OpenSUSE Build Service).
+
+* Mon Sep 15 2008 Alexander Shaduri <ashaduri 'at' gmail.com>
+- Initial .spec file.
+
@@ -1 +0,0 @@
-See NEWS file.
@@ -1,61 +0,0 @@
-
-# Add autoconf.m4 directory to local macro search path
-ACLOCAL_AMFLAGS = -I autoconf.m4
-
-SUBDIRS = src data
-
-
-# These files are actually needed for compilation.
-noinst_DATA = AUTHORS.txt LICENSE_gsmartcontrol.txt README.txt
-
-
-# For the files to be bundled with the distribution, specify them in
-# one of the following.
-
-# These will be installed into docdir.
-# Some of these files are actually needed for compilation (see src/res/Makefile.am).
-dist_doc_DATA = AUTHORS.txt ChangeLog NEWS README.txt \
-	LICENSE_boost_1_0.txt \
-	LICENSE_bsd-ucb.txt \
-	LICENSE_gpl2.txt \
-	LICENSE_gpl3.txt \
-	LICENSE_gsmartcontrol.txt \
-	LICENSE_hz.txt \
-	LICENSE_pcrecpp.txt \
-	LICENSE_zlib.txt
-
-
-# Extra files bundled with distribution.
-# file2csource.sh is needed for building but not installed.
-EXTRA_DIST = COPYING TODO INSTALL configure autogen.sh \
-	baqup gsmartcontrol.kdevelop \
-	templates \
-	file2csource.sh \
-	gsmartcontrol.spec
-
-
-
-# PCH support
-
-global_macros.h.gch: $(top_srcdir)/src/global_macros.h
-	$(CXX) $(CXXFLAGS) $(DEFS) -x "c++-header" $(top_srcdir)/src/global_macros.h -o global_macros.h.gch
-
-gch: global_macros.h.gch
-
-gch-clean:
-	rm -f global_macros.h.gch
-
-distclean-local: gch-clean
-
-
-# rpm support
-
-src-rpm: dist
-	rpmbuild -ts $(distdir).tar.bz2
-
-
-# Don't use this - it does something weird, and gcc errors out with "long long long" errors, etc...
-#rpm: dist
-#	rpmbuild -ta $(distdir).tar.bz2
-
-
@@ -1,6 +0,0 @@
-Version 0.8.0rc2
-	Fix for compilation under gcc 4.3.
-	Removed test data (there's a lot of it and it's unnecessary).
-
-Version 0.8.0rc1
-	Initial release.
@@ -1,16 +0,0 @@
-
-
-
-AC_DEFUN([AC_CXX_VAR_FUNC],
-[AC_CACHE_CHECK(whether $CXX recognizes __func__,
-ac_cv_cxx_var_func,
-[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const char* s = __func__;]])],[ac_cv_cxx_var_func=yes],[ac_cv_cxx_var_func=no])
- AC_LANG_POP([])
-])
-if test "$ac_cv_cxx_var_func" = yes; then
-  AC_DEFINE(HAVE_CXX__FUNC,,[Define if the C++ complier supports __func__])
-fi
-])
-
-
@@ -1,26 +0,0 @@
-[Desktop Entry]
-
-# Desktop file for gnome only.
-OnlyShowIn=GNOME;
-
-# desktop file version
-Version=1.0
-Type=Application
-
-Categories=System;GTK;
-# Categories=Settings;HardwareSettings;
-
-Name=GSmartControl
-# short description, usually shown in parentheses after Name
-GenericName=Hard Disk Health Inspection
-# tooltip
-Comment=Monitor and control SMART data on hard disks
-
-# If it's a name only, it looks for "name.[png|xpm]" file in
-# $XDG_DATA_DIRS/icons and /usr/share/pixmaps.
-# An absolute file path is also supported.
-Icon=gsmartcontrol
-
-# Run with root permissions. Some desktop files used gksu,
-# but it doesn't seem available on my system.
-Exec=gnomesu -c "@prefix@/bin/gsmartcontrol"
@@ -1,28 +0,0 @@
-[Desktop Entry]
-
-# Desktop file for non-gnome and non-kde only.
-NotShowIn=GNOME;KDE;
-
-# desktop file version
-Version=1.0
-Type=Application
-
-Categories=System;GTK;
-# Categories=Settings;HardwareSettings;
-
-Name=GSmartControl
-# short description, usually shown in parentheses after Name
-GenericName=Hard Disk Health Inspection
-# tooltip
-Comment=Monitor and control SMART data on hard disks
-
-# If it's a name only, it looks for "name.[png|xpm]" file in
-# $XDG_DATA_DIRS/icons and /usr/share/pixmaps.
-# An absolute file path is also supported.
-Icon=gsmartcontrol
-
-# Run with root permissions using gnomesu (from libgnomesu).
-# There is also kdesu (kdebase3-runtime, kdebase4-runtime), in different paths.
-# There is also xdg-su, which doesn't work at all on my machine.
-Exec=gnomesu -c "@prefix@/bin/gsmartcontrol"
-# Exec=kdesu -u root "@prefix@/bin/gsmartcontrol"
@@ -1,74 +0,0 @@
-Summary:	GSmartControl - Hard Disk Health Inspection Tool
-Name:		gsmartcontrol
-Version:	@VERSION@
-Release:	1as
-License:	GPLv2, GPLv3
-Vendor:		Alexander Shaduri <ashaduri 'at' gmail.com>
-Url:		http://gsmartcontrol.berlios.de
-Packager:	Alexander Shaduri <ashaduri 'at' gmail.com>
-Group:		Hardware/Other
-Source:		gsmartcontrol-%{version}.tar.bz2
-
-# We need (gtkmm2 >= 2.12 || (gtkmm2 >= 2.6.0 && libglademm >= 2.4.0))
-# Anyone knows how to specify that?
-#Requires:	smartmontools, pcre, gtkmm2 >= 2.6.0, libglademm >= 2.4.0
-Requires:	smartmontools, pcre, gtkmm2 >= 2.12.0
-#BuildRequires:	pcre-devel, gtkmm2-devel >= 2.6.0, libglademm-devel >= 2.4.0
-BuildRequires:	pcre-devel, gtkmm2-devel >= 2.12.0
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-build
-
-%description
-GSmartControl is a graphical user interface for smartctl, which is a tool for
-querying and controlling SMART (Self-Monitoring, Analysis, and Reporting
-Technology) data in hard disk drives. It allows you to inspect the drive's
-SMART data to determine its health, as well as run various tests on it.
-
-%prep
-
-
-%setup -q
-%configure
-# Don't use configure parameters - let rpm set them.
-# --prefix=/usr --enable-default-gcc-options --enable-gcc-optimize
-
-
-%build
-# Setup for parallel builds
-numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
-if [ "$numprocs" = "0" ]; then
-	numprocs=1
-fi
-
-make -j$numprocs
-#make
-
-
-%install
-#make install-strip DESTDIR=$RPM_BUILD_ROOT
-%makeinstall
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-
-%attr(0755,root,root) %{_bindir}/*
-#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/*
-
-%doc %{_datadir}/doc/gsmartcontrol
-
-%{_datadir}/gsmartcontrol
-%{_datadir}/gsmartcontrol/*
-%{_datadir}/applications/*
-%{_datadir}/icons/*
-%{_datadir}/pixmaps/*
-
-
-%changelog
-* Mon Sep 15 2008 Alexander Shaduri <ashaduri 'at' gmail.com>
- Initial .spec file.
-
@@ -1,41 +0,0 @@
-AM_CPPFLAGS = $(all_includes)
-METASOURCES = AUTO
-noinst_LIBRARIES = libapplib.a
-libapplib_a_SOURCES = app_gtkmm_utils.cpp cmdex.cpp cmdex_sync.cpp \
-	cmdex_sync_gui.cpp gui_utils.cpp selftest.cpp smartctl_parser.cpp storage_detector.cpp \
-	storage_device.cpp storage_property.cpp storage_property_descr.cpp
-noinst_HEADERS = app_gtkmm_features.h app_gtkmm_utils.h app_pcrecpp.h \
-	app_ui_res_utils.h cmdex.h cmdex_sync.h cmdex_sync_gui.h gui_utils.h selftest.h smartctl_executor.h \
-	smartctl_executor_gui.h smartctl_parser.h storage_detector.h storage_device.h \
-	storage_property.h storage_property_colors.h storage_property_descr.h storage_settings.h \
-	wrapping_label.h
-
-# don't use absolute path for the current dir's .a, because the make
-# dependency resolver won't get it (needed for parallel builds)
-
-storage_detector_test_SOURCES = storage_detector_test.cpp
-storage_detector_test_LDADD = libapplib.a \
-	$(top_builddir)/src/pcrecpp/libpcrecpp.a $(top_builddir)/src/libdebug/libdebug.a
-
-smartctl_executor_test_SOURCES = smartctl_executor_test.cpp
-smartctl_executor_test_LDADD = libapplib.a \
-	$(top_builddir)/src/libdebug/libdebug.a
-
-smartctl_parser_test_SOURCES = smartctl_parser_test.cpp
-smartctl_parser_test_LDADD = libapplib.a \
-	$(top_builddir)/src/pcrecpp/libpcrecpp.a $(top_builddir)/src/libdebug/libdebug.a
-
-# Build them first
-SUBDIRS=../libdebug ../pcrecpp
-
-
-# we don't list them in a separate variable because otherwise kdevelop won't see them.
-noinst_PROGRAMS =
-if ENABLE_TESTS
-noinst_PROGRAMS += smartctl_executor_test smartctl_parser_test \
-	storage_detector_test
-endif
-
-tests: $(noinst_PROGRAMS)
-
-
@@ -1,79 +0,0 @@
-/**************************************************************************
- Copyright:
-      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
- License: See LICENSE_gsmartcontrol.txt
-***************************************************************************/
-
-#include <gtkmm/messagedialog.h>
-
-#include "gui_utils.h"
-
-
-namespace
-{
-
-	inline void show_dialog(const std::string& message, const std::string& sec_message,
-			Gtk::Window* parent, Gtk::MessageType type, bool sec_msg_markup)
-	{
-		// no markup, modal
-		Gtk::MessageDialog dialog("\n" + message + (sec_message.empty() ? "\n" : ""),
-				false, type, Gtk::BUTTONS_OK, true);
-
-		if (!sec_message.empty())
-			dialog.set_secondary_text(sec_message, sec_msg_markup);
-
-		if (parent) {
-			dialog.set_transient_for(*parent);
-			dialog.set_position(Gtk::WIN_POS_CENTER_ON_PARENT);
-		} else {
-			dialog.set_position(Gtk::WIN_POS_MOUSE);
-		}
-
-		dialog.run();  // blocks until the dialog is closed
-	}
-
-}
-
-
-
-void gui_show_error_dialog(const std::string& message, Gtk::Window* parent)
-{
-	show_dialog(message, "", parent, Gtk::MESSAGE_ERROR, false);
-}
-
-void gui_show_error_dialog(const std::string& message, const std::string& sec_message,
-		Gtk::Window* parent, bool sec_msg_markup)
-{
-	show_dialog(message, sec_message, parent, Gtk::MESSAGE_ERROR, sec_msg_markup);
-}
-
-
-
-void gui_show_warn_dialog(const std::string& message, Gtk::Window* parent)
-{
-	show_dialog(message, "", parent, Gtk::MESSAGE_WARNING, false);
-}
-
-void gui_show_warn_dialog(const std::string& message, const std::string& sec_message,
-		Gtk::Window* parent, bool sec_msg_markup)
-{
-	show_dialog(message, sec_message, parent, Gtk::MESSAGE_WARNING, sec_msg_markup);
-}
-
-
-
-void gui_show_info_dialog(const std::string& message, Gtk::Window* parent)
-{
-	show_dialog(message, "", parent, Gtk::MESSAGE_INFO, false);
-}
-
-void gui_show_info_dialog(const std::string& message, const std::string& sec_message,
-		Gtk::Window* parent, bool sec_msg_markup)
-{
-	show_dialog(message, sec_message, parent, Gtk::MESSAGE_INFO, sec_msg_markup);
-}
-
-
-
-
-
@@ -1,170 +0,0 @@
-/**************************************************************************
- Copyright:
-      (C) 2008  Alexander Shaduri <ashaduri 'at' gmail.com>
- License: See LICENSE_gsmartcontrol.txt
-***************************************************************************/
-
-#include <ios>  // std::boolalpha
-// #include <glibmm/fileutils.h>  // Dir
-#include <algorithm>  // std::find
-
-#include "hz/debug.h"
-#include "hz/fs_dir.h"
-#include "rconfig/rconfig_mini.h"
-
-#include "app_pcrecpp.h"
-#include "storage_detector.h"
-
-
-
-std::string StorageDetector::detect(std::vector<StorageDeviceRefPtr>& drives)
-{
-//	std::vector<std::string> all_devices;
-// 	try {
-// 		Glib::Dir dir("/sys/block");  // lists all block devices which may have filesystems
-// 		all_devices.insert(all_devices.begin(), dir.begin(), dir.end());
-// 	}
-// 	catch (Glib::FileError& e) {
-// 		std::string msg = std::string("Error while detecting storage devices: ") + e.what();
-// 		debug_out_error("app", DBG_FUNC_MSG << msg << "\n");
-// 		return msg;
-// 	}
-	// hz::Dir dir("/sys/block");
-
-
-	// this defaults to "/dev/disk/by-id"
-	std::string dev_dir;
-	if (!rconfig::get_data("system/device_scan_path", dev_dir) || dev_dir.empty()) {
-		return "Device scan directory not set.";
-	}
-
-	hz::Dir dir(dev_dir);
-
-	std::vector<std::string> all_devices;
-	if (!dir.entry_list(all_devices, false)) {
-		return dir.get_error_utf8();
-	}
-
-	// filter-out the ones with "partN" in them
-	std::vector<std::string> devices;
-	for (unsigned int i = 0; i < all_devices.size(); ++i) {
-		std::string entry = all_devices[i];
-		if (entry == "." || entry == ".." || app_pcre_match("/-part[0-9]+$/", entry))
-			continue;
-
-		hz::FsPath path = dev_dir + hz::DIR_SEPARATOR_S + all_devices[i];
-
-		// those are usually relative links, so find out where they are pointing to.
-		std::string link_dest;
-		if (path.get_link_destination(link_dest)) {
-			path = (hz::path_is_absolute(link_dest) ? link_dest : (dev_dir + hz::DIR_SEPARATOR_S + link_dest));
-			path.compress();  // compress in case there are ../-s.
-		}
-
-		// skip number-ended devices, in case we couldn't filter out the scan directory correctly
-		// (it's user-settable after all).
-		if (app_pcre_match("/[0-9]+$/", path.str()))
-			continue;
-
-		if (std::find(devices.begin(), devices.end(), path.str()) == devices.end())  // there may be duplicates
-			devices.push_back(path.str());
-	}
-
-
-	for (std::vector<std::string>::const_iterator iter = devices.begin(); iter != devices.end(); ++iter) {
-		std::string dev = *iter;
-
-		// try to match against patterns
-		for (unsigned int i = 0; i < match_patterns_.size(); i++) {
-			// try to match against general filter
-			if (!app_pcre_match(match_patterns_[i], dev))
-				continue;
-
-			// matched, check the blacklist
-			bool blacked = false;
-			for (unsigned int j = 0; j < blacklist_patterns_.size(); j++) {
-				if (app_pcre_match(blacklist_patterns_[j], dev)) {  // matched the blacklist too
-					blacked = true;
-					break;
-				}
-			}
-
-			StorageDeviceRefPtr drive(new StorageDevice(dev));
-			debug_out_info("app", "Found device: \"" << drive->get_device() << "\".\n");
-
-			if (!blacked) {
-				drives.push_back(drive);
-				break;  // no need to match other patters, go to next device
-
-			} else {  // blacklisted
-				debug_out_info("app", "Device \"" << drive->get_device() << "\" is blacklisted, ignoring.\n");
-				break;  // go to next device
-			}
-		}
-
-	}
-
-	return std::string();
-}
-
-
-
-std::string StorageDetector::fetch_basic_data(std::vector<StorageDeviceRefPtr>& drives,
-		hz::intrusive_ptr<CmdexSync> smartctl_ex, bool return_first_error)
-{
-	fetch_data_errors_.clear();
-	fetch_data_error_outputs_.clear();
-
-	for (unsigned int i = 0; i < drives.size(); ++i) {
-		StorageDeviceRefPtr drive = drives[i];
-		debug_out_info("app", "Retrieving basic information about the device...\n");
-
-		smartctl_ex->set_running_msg("Running %s on " + drive->get_device() + "...");
-
-		// don't show any errors here - we don't want a screen flood.
-		// no need for gui-based executors here, we already show the message in
-		// iconview background (if called from main window)
-		std::string error_msg = drive->fetch_basic_data_and_parse(smartctl_ex);
-
-		// normally we skip drives with errors - possibly scsi, etc...
-		if (return_first_error && !error_msg.empty())
-			return error_msg;
-
-		if (!error_msg.empty()) {
-			// use original executor error if present (permits matches by our users).
-			// if (!smartctl_ex->get_error_msg().empty())
-			//	error_msg = smartctl_ex->get_error_msg();
-
-			fetch_data_errors_.push_back(error_msg);
-			fetch_data_error_outputs_.push_back(smartctl_ex->get_stdout_str());
-		}
-
-		debug_out_dump("app", "Device information for " << drive->get_device() << ":\n"
-				<< "\tModel: " << drive->get_model_name() << "\n"
-				<< "\tType: " << StorageDevice::get_type_name(drive->get_type()) << "\n"
-				<< "\tSMART status: " << StorageDevice::get_status_name(drive->get_smart_status()) << "\n"
-				);
-
-	}
-
-	return std::string();
-}
-
-
-
-std::string StorageDetector::detect_and_fetch_basic_data(std::vector<StorageDeviceRefPtr>& put_drives_here,
-		hz::intrusive_ptr<CmdexSync> smartctl_ex)
-{
-	std::string error_msg = detect(put_drives_here);
-
-	if (error_msg.empty())
-		fetch_basic_data(put_drives_here, smartctl_ex);  // ignore its errors, there may be plenty of them.
-
-	return error_msg;
-}
-
-
-
-
-
-
@@ -1,54 +0,0 @@
-
-
-extern const unsigned char AUTHORS_txt[] = {
-
-0x41,
-0x6C,
-0x65,
-0x78,
-0x61,
-0x6E,
-0x64,
-0x65,
-0x72,
-0x20,
-0x53,
-0x68,
-0x61,
-0x64,
-0x75,
-0x72,
-0x69,
-0x20,
-0x3C,
-0x61,
-0x73,
-0x68,
-0x61,
-0x64,
-0x75,
-0x72,
-0x69,
-0x20,
-0x27,
-0x61,
-0x74,
-0x27,
-0x20,
-0x67,
-0x6D,
-0x61,
-0x69,
-0x6C,
-0x2E,
-0x63,
-0x6F,
-0x6D,
-0x3E,
-0xA,
-
- 0x0 };
-
-extern const unsigned int AUTHORS_txt_size = 44;
-
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexander Shaduri	77e3668173	Tagging 0.8.2: Fixed gsmartcontrol_root.sh script to support distributions with no /usr/sbin in their users' paths (thanks to Erwan Velu). Added desktop auto-detection to gsmartcontrol_root.sh script. This allows us to use only one desktop file (thanks to Erwan Velu). Added debian package directory (named "debian.dist" for now to avoid control file conflicts with Build Service). Renamed gsmartcontrol_root.sh to gsmartcontrol-root, to make Debian happy. Added make targets for Windows packages (zip and NSIS). Fixed Windows-related issues (Vista is fully supported now). Fixed minor bugs: Smartctl parser is win32-locale-aware now. No more unnecessary parsing. No segfault on exit under Windows and Solaris. A friendlier message is displayed if smartctl was not found. No hilighted labels when switching tabs in Information window.	2010-12-26 19:34:23 +00:00
Alexander Shaduri	5c257ffdc4	Tagging 0.8.2.	2010-12-26 19:33:25 +00:00
Alexander Shaduri	dc6297b0c9	Importing 0.8.1	2010-12-26 19:24:29 +00:00
Alexander Shaduri	3a181b6880	Imported 0.8.0rc4.	2010-12-26 18:54:11 +00:00
Alexander Shaduri	9677b33f54	SVN cleanup	2010-12-26 18:49:40 +00:00
Alexander Shaduri	0503d97e62	Importing 0.8.0rc3. SVN cleanup.	2010-12-26 18:48:16 +00:00
				`@@ -0,0 +1,2 @@`

				`EXTRA_DIST = distribution.txt.in gsmartcontrol.nsi.in nsi_install.ico nsi_uninstall.ico`