From a778cba1be407c260cf9c94bfb8a68a9d1f3f288 Mon Sep 17 00:00:00 2001
From: niels <niels@dyne.org>
Date: Mon, 9 Sep 2013 21:56:26 +0200
Subject: [PATCH] fix resource loading when install prefix is used, fix
 enable-debug configure option

---
 veejay-current/veejay-client/configure.ac        | 8 +++++---
 veejay-current/veejay-client/gveejay-paths.sh.in | 6 ------
 veejay-current/veejay-client/src/vj-api.c        | 5 +++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/veejay-current/veejay-client/configure.ac b/veejay-current/veejay-client/configure.ac
index 2b9fd733..a7aec4ec 100644
--- a/veejay-current/veejay-client/configure.ac
+++ b/veejay-current/veejay-client/configure.ac
@@ -219,6 +219,8 @@ dnl Look for X
 AC_PATH_XTRA
 AM_CONDITIONAL(HAVE_X, test x$have_x = xyes)
 
+debugCFLAGS=-g
+
 AC_MSG_CHECKING(whether to compile in profiling information)
 if test "x$enable_profiling" = "xyes" ; then
  debugCFLAGS="$debugCFLAGS -fprofile-arcs -ftest-coverage"
@@ -230,7 +232,7 @@ else
 fi
 AC_MSG_CHECKING(whether to compile in assertion checking)
 if test "x$enable_strict" = "xyes" ; then
- debugCFLAGS="$debugCFLAGS -g -DSTRICT_CHECKING"
+ debugCFLAGS="$debugCFLAGS -DSTRICT_CHECKING"
  AC_MSG_RESULT([yes])
 else
  AC_MSG_RESULT([no])
@@ -507,7 +509,6 @@ then
 	AC_MSG_NOTICE([enable_debug = $enable_debug])
 	if test "x$enable_debug" != "xyes" ;
 	then
-		AC_MSG_NOTICE([debug koekje])
 		if test $ac_cv_flag_sse = yes; then
 			CFLAGS="$CFLAGS -msse -mfpmath=sse"
 			AC_MSG_NOTICE([cflags aangepast])
@@ -595,7 +596,7 @@ if test x"$with_extra_cflags" != "x"; then
    CXXFLAGS="$CXXFLAGS $with_extra_cflags"
 fi
 
-reloaded_datadir="${datadir}/reloaded"
+reloaded_datadir="${datarootdir}/reloaded"
 AC_SUBST(reloaded_datadir)
 sh gveejay-paths.sh > gveejay-paths.h
 
@@ -670,3 +671,4 @@ AC_MSG_NOTICE([  - Veejay 1.5.28                 : ${have_veejay}])
 AC_MSG_NOTICE([  - POSIX Threads (pthread)       : ${have_pthread}])
 AC_MSG_NOTICE([  - GDK Pixbuf support            : ${have_pixbuf}])
 AC_MSG_NOTICE([  - Alsa support (midi sequencer) : ${have_alsa}])
+AC_MSG_NOTICE([])
diff --git a/veejay-current/veejay-client/gveejay-paths.sh.in b/veejay-current/veejay-client/gveejay-paths.sh.in
index ca89f217..7fcc6a1b 100644
--- a/veejay-current/veejay-client/gveejay-paths.sh.in
+++ b/veejay-current/veejay-client/gveejay-paths.sh.in
@@ -1,10 +1,4 @@
 #!/bin/sh -e
-
-prefix="@prefix@"
-datadir="@datadir@"
-
-DATADIRNAME="@DATADIRNAME@"
-
 reloaded_datadir="@reloaded_datadir@"
 
 cat << EOF
diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c
index 72f3fb2f..ef978e7d 100644
--- a/veejay-current/veejay-client/src/vj-api.c
+++ b/veejay-current/veejay-client/src/vj-api.c
@@ -6828,7 +6828,6 @@ void 	vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num,
 	}
 	snprintf( glade_path, sizeof(glade_path), "%s/%s",RELOADED_DATADIR,glade_file);
 
-
 	veejay_memset( gui->status_tokens, 0, sizeof(int) * STATUS_TOKENS );
 	veejay_memset( gui->sample, 0, 2 );
 	veejay_memset( gui->selection, 0, 3 );
@@ -6849,9 +6848,11 @@ void 	vj_gui_init(char *glade_file, int launcher, char *hostname, int port_num,
 
 	gui->client = NULL;
 	gui->main_window = glade_xml_new(glade_path,NULL,NULL);
-	if(!gui->main_window)
+	if(gui->main_window == NULL)
 	{
 		free(gui);
+		veejay_msg( 0, "Cannot find '%s'", glade_path );
+		return;
 	}
 	info = gui;