Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
Makefile.am autogen.sh configure.in
Log Message:
Add hack to make apps lauched from e16 in window mode appear in the virtual
root in stead of the real root.
===================================================================
RCS file: /cvs/e/e16/e/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- Makefile.am 17 Apr 2006 15:55:24 -0000 1.43
+++ Makefile.am 10 Sep 2006 18:43:19 -0000 1.44
@@ -1,4 +1,4 @@
-SUBDIRS = intl dox eesh epp src config themes man scripts misc po
+SUBDIRS = intl dox eesh epp src lib config themes man scripts misc po
EXTRA_DIST = \
timestamp.h \
===================================================================
RCS file: /cvs/e/e16/e/autogen.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- autogen.sh 24 Aug 2006 19:59:18 -0000 1.21
+++ autogen.sh 10 Sep 2006 18:43:19 -0000 1.22
@@ -21,6 +21,8 @@
autoconf || exit 1
echo "Running autoheader"
autoheader || exit 1
+echo "Running libtoolize"
+libtoolize --copy --automake || glibtoolize --automake || exit 1
echo "Running automake --add-missing"
automake --copy --add-missing || exit 1
===================================================================
RCS file: /cvs/e/e16/e/configure.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- configure.in 10 Sep 2006 06:58:29 -0000 1.168
+++ configure.in 10 Sep 2006 18:43:19 -0000 1.169
@@ -50,6 +50,10 @@
AC_HEADER_STDC
+AM_ENABLE_SHARED
+AC_LIBTOOL_DLOPEN
+AM_PROG_LIBTOOL
+
AC_PATH_X
AC_PATH_XTRA
@@ -113,11 +117,14 @@
fi
ENLIGHTENMENT_ROOT=`eval echo ${DATADIR}/e16`
ENLIGHTENMENT_BIN=`eval echo ${bindir}`
+ENLIGHTENMENT_LIB=`eval echo ${libdir}`
AC_SUBST(ENLIGHTENMENT_ROOT)
AC_SUBST(ENLIGHTENMENT_BIN)
+AC_SUBST(ENLIGHTENMENT_LIB)
AC_SUBST(LOCALEDIR)
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_ROOT, "$ENLIGHTENMENT_ROOT", [The
installation root directory])
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_BIN, "$ENLIGHTENMENT_BIN", [The installation
bin directory])
+AC_DEFINE_UNQUOTED(ENLIGHTENMENT_LIB, "$ENLIGHTENMENT_LIB", [The installation
lib directory])
AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [The installation locale
directory])
if test "x$enable_sound" = "xyes"; then
@@ -246,6 +253,18 @@
echo " We highly suggest that you rectify this situation immediately."
])
+AC_ARG_ENABLE(roothacklib,
+ [ --enable-roothacklib build window mode helper library
@<:@default=yes@:>@],,
+ enable_roothacklib=yes)
+if test "x$enable_roothacklib" = "xyes"; then
+ AC_CHECK_LIB(dl, dlopen, DLOPEN_LIBS=-ldl, enable_roothacklib=no)
+ AC_SUBST(DLOPEN_LIBS)
+fi
+if test "x$enable_roothacklib" = "xyes"; then
+ AC_DEFINE(USE_ROOTHACKLIB, 1, [Use window mode helper library])
+fi
+AM_CONDITIONAL(BUILD_ROOTHACKLIB, test "x$enable_roothacklib" = "xyes")
+
AC_ARG_ENABLE(gcc-warnings,
[ --enable-gcc-warnings enable GCC compiler warnings @<:@default=no@:>@],,
enable_gcc_warnings=no)
@@ -262,6 +281,7 @@
dox/E-docs/Makefile
eesh/Makefile
epp/Makefile
+lib/Makefile
man/Makefile
config/Makefile
config/pix/Makefile
@@ -295,6 +315,7 @@
echo " Xinerama ..................... $enable_xinerama"
echo " RandR ........................ $enable_xrandr"
echo " Composite .................... $enable_composite"
+echo " Window mode helper library ... $enable_roothacklib"
echo
echo "Experimental options - DO NOT USE unless you know what you are doing"
echo " Compile with ecore/ecore_x ... $enable_ecore"
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
