Merge lp:~david.gabor.bodor/sakura/config-file-option into lp:~dabisu/sakura/sakura

[Dávid Gábor Bodor]

This patch is long overdue, my sincere apologies for that.

I made the config-file option use the sakura config dir as a base, also, updated the man pages to include the new option. (Please check them, I'm not a native english speaker).
Also removed a printf I accidentally left in for debug purposes.

This revision already includes the fix for the linker error concerning libm.so

[David Gómez (dabisu)]

Thanks Bodor, I've merged the latest changes.

[David Gómez (dabisu)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-27 13:39:19 +0000
+++ CMakeLists.txt	2012-03-02 16:32:23 +0000
@@ -43,7 +43,7 @@
 
 INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
 LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS})
-LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES})
+LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} m)
 ADD_EXECUTABLE (sakura src/sakura.c)
 ADD_DEPENDENCIES (sakura src/sakura.c src/sakura.h)
 
 
=== modified file 'po/sakura.pot'
--- po/sakura.pot	2012-02-27 13:38:29 +0000
+++ po/sakura.pot	2012-03-02 16:32:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-27 14:37+0100\n"
+"POT-Creation-Date: 2012-03-02 17:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 
=== modified file 'sakura.pod'
--- sakura.pod	2010-10-19 14:27:36 +0000
+++ sakura.pod	2012-03-02 16:32:23 +0000
@@ -78,6 +78,11 @@
 
 X display to use
 
+=item B<--config-file=FILENAME>
+
+Use alternate configurtation file. Path is relative to the sakura config dir.
+(Example: ~/.config/sakura/FILENAME).
+
 =back
 
 =head1 GTK+ OPTIONS
 
=== modified file 'src/sakura.c'
--- src/sakura.c	2012-02-27 13:35:40 +0000
+++ src/sakura.c	2012-03-02 16:32:23 +0000
@@ -1589,8 +1589,7 @@
 	if( ! g_file_test( configdir, G_FILE_TEST_EXISTS) )
 		g_mkdir( configdir, 0755 );
 	if (option_config_file) {
-		sakura.configfile=option_config_file;
-		printf("The config file is: %s", option_config_file);
+		sakura.configfile=g_build_filename(configdir, option_config_file, NULL);
 	} else {
 		/* Use more standard-conforming path for config files, if available. */
 		sakura.configfile=g_build_filename(configdir, DEFAULT_CONFIGFILE, NULL);