src/CMakeLists.txt |   16 +++++++---------

 src/lua_conf.c     |    8 ++++++++

 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index fdedda0..4f0c6e3 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -15,9 +15,12 @@ SET(TARGET "termit")

 INCLUDE_DIRECTORIES(${TERMIT_SOURCE_DIR})

-INCLUDE (FindGTK)

-

 INCLUDE (FindPkgConfig)

+pkg_search_module(GTK REQUIRED gtk+-2.0)

+IF(NOT GTK_FOUND)

+  message(FATAL_ERROR "gtk+2.0 library not found")

+ENDIF(NOT GTK_FOUND)

+

 pkg_search_module(VTE REQUIRED libvte>=0.17.1 vte>=0.17.1)

 IF(NOT VTE_FOUND)

   message(FATAL_ERROR "vte library not found")

@@ -41,6 +44,7 @@ ENDIF(DEBUG)

 set(TERMIT_LDFLAGS ${VTE_LDFLAGS} ${GTK_LDFLAGS})

+

 SET_SOURCE_FILES_PROPERTIES(${TERMIT_SRCS} PROPERTIES 

   COMPILE_FLAGS "${TERMIT_CFLAGS}")

@@ -50,13 +54,7 @@ ADD_EXECUTABLE(${TARGET} ${TERMIT_SRCS})

 #  LINK_FLAGS ${TERMIT_LDFLAGS})

 #set_target_properties(${TARGET} PROPERTIES LINK_FLAGS ${TERMIT_LDFLAGS})

-SET(TERMIT_LDFLAGS "")

-FOREACH(ldflag ${VTE_LDFLAGS} ${GTK_LDFLAGS})

-  SET(TERMIT_LDFLAGS "${TERMIT_LDFLAGS} ${ldflag}")

-ENDFOREACH(ldflag)

-set_target_properties(${TARGET} PROPERTIES LINK_FLAGS "${TERMIT_LDFLAGS}")

-

-target_link_libraries(${TARGET} ${LUA_LIBRARIES})

+target_link_libraries(${TARGET} ${LUA_LIBRARIES} ${VTE_LIBRARIES} ${GTK_LIBRARIES})

 INSTALL(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

diff --git a/src/lua_conf.c b/src/lua_conf.c

index e146c46..f8158b0 100644

--- a/src/lua_conf.c

+++ b/src/lua_conf.c

@@ -197,6 +197,14 @@ static void load_init(const gchar* initFile)

             fullPath = g_strdup_printf("%s/init.lua", path);

             ERROR("[%s] is deprecated, use rc.lua instead", "init.lua");

         }

+        if (g_file_test(fullPath, G_FILE_TEST_EXISTS) == FALSE) {

+            g_free(fullPath);

+            fullPath = g_strdup_printf("/etc/xdg/termit/rc.lua");

+	}

+        if (g_file_test(fullPath, G_FILE_TEST_EXISTS) == FALSE) {

+            g_free(fullPath);

+            fullPath = g_strdup_printf("/etc/xdg/termit/init.lua");

+	}

         g_free(path);

     }

     TRACE("config: %s", fullPath);