[directfb-users] Re: MODULEDIR

[Kent Sandvik <sandvik@mac.com>]

Sven Neumann wrote:


> You could add --with-moduledir=DIR to the configure script and allow
> to override the default MODULEDIR with this setting. You will have to
> edit configure.in for this. Let me know if you need any help.
Hi, here's a possible patch (against 0.9.20), let me know if something 
like this would work or not. --Kent

---
diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/configure.in DirectFB-0.9.20/configure.in
--- DirectFB-0.9.20.old/configure.in	2003-09-29 10:03:33.000000000 -0700
+++ DirectFB-0.9.20/configure.in	2004-07-17 10:53:10.000000000 -0700
@@ -896,6 +896,13 @@

 AM_CONDITIONAL(BUILD_STATIC, test x$enable_static = xyes)

+# Sysroot used for runtime module loading, etc.
+AC_ARG_WITH(sysroot,
+[  --with-sysroot=DIR      search for lib/share et al within DIR at 
runtime]
+[                            (e.g. when loading modules)],
+[ RUNTIME_SYSROOT="$withval" ], [ RUNTIME_SYSROOT= ] )
+test x"$RUNTIME_SYSROOT" = x"no" && RUNTIME_SYSROOT=
+AC_SUBST(RUNTIME_SYSROOT)

 if test "x$enable_debug" = xyes; then
   MODULEDIRNAME=directfb-$BINARY_VERSION-debug
@@ -1005,6 +1012,7 @@
   Install prefix        $prefix
   Build shared libs     $enable_shared
   Build static libs     $enable_static
+  Runtime sysroot       ${RUNTIME_SYSROOT:-<none>}
   Module directory      $MODULEDIR
   CFLAGS                $CFLAGS

Only in DirectFB-0.9.20: depcomp
diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/src/core/fbdev/Makefile.am 
DirectFB-0.9.20/src/core/fbdev/Makefile.am
--- DirectFB-0.9.20.old/src/core/fbdev/Makefile.am	2003-06-13 
02:19:48.000000000 -0700
+++ DirectFB-0.9.20/src/core/fbdev/Makefile.am	2004-07-17 
10:30:52.000000000 -0700
@@ -6,9 +6,9 @@
 	-I$(top_srcdir)/src

 AM_CPPFLAGS = \
-	-DDATADIR=\"@DATADIR@\"		\
+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\"		\
 	-DSOPATH=\"@SOPATH@\"		\
-	-DMODULEDIR=\"@MODULEDIR@\"	\
+	-DMODULEDIR=\"${RUNTIME_SYSROOT}@MODULEDIR@\"	\
 	"-DBUILDTIME=\"`date -u "+%Y-%m-%d %H:%M"`\""


diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/src/core/fusion/Makefile.am 
DirectFB-0.9.20/src/core/fusion/Makefile.am
--- DirectFB-0.9.20.old/src/core/fusion/Makefile.am	2003-07-07 
10:20:48.000000000 -0700
+++ DirectFB-0.9.20/src/core/fusion/Makefile.am	2004-07-17 
10:30:52.000000000 -0700
@@ -10,8 +10,8 @@
 	-I$(top_srcdir)/src

 AM_CPPFLAGS = \
-	-DDATADIR=\"@DATADIR@\"	\
-	-DMODULEDIR=\"@MODULEDIR@\"
+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\"	\
+	-DMODULEDIR=\"${RUNTIME_SYSROOT}@MODULEDIR@\"


 internalincludedir = $(INTERNALINCLUDEDIR)/core/fusion
diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/src/core/fusion/shmalloc/Makefile.am 
DirectFB-0.9.20/src/core/fusion/shmalloc/Makefile.am
--- DirectFB-0.9.20.old/src/core/fusion/shmalloc/Makefile.am	2003-07-07 
08:43:27.000000000 -0700
+++ DirectFB-0.9.20/src/core/fusion/shmalloc/Makefile.am	2004-07-17 
10:30:52.000000000 -0700
@@ -6,8 +6,8 @@
 	-I$(top_srcdir)/src

 AM_CPPFLAGS = \
-	-DDATADIR=\"@DATADIR@\"	\
-	-DMODULEDIR=\"@MODULEDIR@\"
+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\"	\
+	-DMODULEDIR=\"${RUNTIME_SYSROOT}@MODULEDIR@\"


 noinst_LTLIBRARIES = libdirectfb_shmalloc.la
diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/src/core/Makefile.am 
DirectFB-0.9.20/src/core/Makefile.am
--- DirectFB-0.9.20.old/src/core/Makefile.am	2003-09-15 
07:06:14.000000000 -0700
+++ DirectFB-0.9.20/src/core/Makefile.am	2004-07-17 10:30:52.000000000 -0700
@@ -20,9 +20,9 @@
 	-I$(top_srcdir)/src

 AM_CPPFLAGS = \
-	-DDATADIR=\"@DATADIR@\"		\
+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\"		\
 	-DSOPATH=\"@SOPATH@\"		\
-	-DMODULEDIR=\"@MODULEDIR@\"	\
+	-DMODULEDIR=\"${RUNTIME_SYSROOT}@MODULEDIR@\"	\
 	"-DBUILDTIME=\"`date -u "+%Y-%m-%d %H:%M"`\""


diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/src/core/sdl/Makefile.am 
DirectFB-0.9.20/src/core/sdl/Makefile.am
--- DirectFB-0.9.20.old/src/core/sdl/Makefile.am	2003-08-18 
08:46:50.000000000 -0700
+++ DirectFB-0.9.20/src/core/sdl/Makefile.am	2004-07-17 
10:30:52.000000000 -0700
@@ -8,9 +8,9 @@
 AM_CFLAGS = $(SDL_CFLAGS)

 AM_CPPFLAGS = \
-	-DDATADIR=\"@DATADIR@\"		\
+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\"		\
 	-DSOPATH=\"@SOPATH@\"		\
-	-DMODULEDIR=\"@MODULEDIR@\"	\
+	-DMODULEDIR=\"${RUNTIME_SYSROOT}@MODULEDIR@\"	\
 	"-DBUILDTIME=\"`date -u "+%Y-%m-%d %H:%M"`\""


diff -x 'config.*' -x Makefile.in -x '*.cache' -x '*.m4' -x configure -x 
ltmain.sh -aur DirectFB-0.9.20.old/src/Makefile.am 
DirectFB-0.9.20/src/Makefile.am
--- DirectFB-0.9.20.old/src/Makefile.am	2003-10-20 13:03:38.000000000 -0700
+++ DirectFB-0.9.20/src/Makefile.am	2004-07-17 10:30:52.000000000 -0700
@@ -8,8 +8,8 @@
 	-I$(top_srcdir)/src

 AM_CPPFLAGS = \
-	-DDATADIR=\"@DATADIR@\"	\
-	-DMODULEDIR=\"@MODULEDIR@\"
+	-DDATADIR=\"${RUNTIME_SYSROOT}@DATADIR@\"	\
+	-DMODULEDIR=\"${RUNTIME_SYSROOT}@MODULEDIR@\"


 internalincludedir = $(INTERNALINCLUDEDIR)