Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui
Modified Files:
Makefile.am autogen.sh configure.in
Log Message:
autoKUNGfoo started. Currently things don't build anymore because of deps. I'm
fixing that now. Also, now that i understand the use of MAINTAINERCLEANFILES,
i'm stuffing it everywhere. The new moto... "Where there is a Makefile.am,
there is a MAINTAINERCLEANFILE!" :)
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 12 Aug 2006 17:20:39 -0000 1.3
+++ Makefile.am 13 Aug 2006 01:00:32 -0000 1.4
@@ -1,7 +1,11 @@
SUBDIRS = data src
MAINTAINERCLEANFILES = \
- debian/changelog
+ Makefile.in aclocal.m4 config.guess \
+ config.h.in config.sub configure install-sh \
+ ltconfig ltmain.sh missing mkinstalldirs depcomp \
+ stamp-h.in compile \
+ debian/changelog
EXTRA_DIST = \
debian/changelog \
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- autogen.sh 12 Aug 2006 09:42:12 -0000 1.1
+++ autogen.sh 13 Aug 2006 01:00:32 -0000 1.2
@@ -1,11 +1,9 @@
#!/bin/sh
-rm -rf autom4te.cache || echo "No cache"
-rm -f aclocal.m4 ltmain.sh || echo "not run yet"
+rm -rf autom4te.cache
+rm -f aclocal.m4 ltmain.sh
-touch README
-
-echo "Running aclocal..." ; aclocal || exit 1
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize
--automake) || exit 1
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in 12 Aug 2006 17:20:39 -0000 1.4
+++ configure.in 13 Aug 2006 01:00:32 -0000 1.5
@@ -1,27 +1,120 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
-#AC_PREREQ(2.60)
-AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
-AM_INIT_AUTOMAKE(entrance_edit_gui, 0.0.1, Essien Ita Essien <[EMAIL
PROTECTED]>)
-AC_PROG_LIBTOOL
+# get rid of that stupid cache mechanism
+rm -f config.cache
-AC_CONFIG_HEADER([config.h])
+AC_INIT(configure.in)
-# Checks for programs.
-AC_PROG_CC
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
-# Checks for libraries.
+AM_INIT_AUTOMAKE(entrance_edit_gui, 0.0.1)
-# Checks for header files.
-AC_CHECK_HEADERS([ ])
+AC_PREREQ(2.52)
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+AM_CONFIG_HEADER(config.h)
-# Checks for library functions.
+AC_ISC_POSIX
+AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+AC_C_CONST
+AM_ENABLE_SHARED
+AM_PROG_LIBTOOL
+LIBS=""
+
+if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+else
+ if test "x${prefix}" = "xNONE"; then
+ bindir="${ac_default_prefix}/bin";
+ else
+ bindir="${prefix}/bin";
+ fi
+fi
+
+if test "x${exec_prefix}" = "xNONE"; then
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
+else
+ if test "x${prefix}" = "xNONE"; then
+ libdir="${ac_default_prefix}/lib";
+ else
+ libdir="${prefix}/lib";
+ fi
+fi
+
+dnl Set PACKAGE_DATA_DIR in config.h.
+if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared
Data Directory])
+fi
+
+dnl Set PACKAGE_BIN_DIR in config.h.
+if test "x${bindir}" = 'xNONE'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin",
[Installation Directory for User Executables])
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation
Directory for User Executables])
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation Directory for
User Executables])
+fi
+
+dnl Set PACKAGE_LIB_DIR in config.h.
+if test "x${libdir}" = 'xNONE'; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib",
[Installation Directory for Libraries])
+ else
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation
Directory for Libraries])
+ fi
+else
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation Directory for
Libraries])
+fi
+
+#dnl Set PACKAGE_SOURCE_DIR in config.h.
+#packagesrcdir=`cd $srcdir && pwd`
+#AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code
Directory])
+
+#check for ETK
+AC_PATH_EFL(
+ etk,
+ 0.1.0.001,
+ [
+ AC_DEFINE(HAVE_ETK, 1, have ETK)
+ etk="ETK "
+ AM_CONDITIONAL(HAVE_ETK, true)
+ have_etk="yes"
+ etk_libs=`etk-config --libs`
+ etk_cflags=`etk-config --cflags`
+ ],
+ [
+ AC_MSG_ERROR([No Etk, can't build.])
+ ]
+)
+
+dnl Set ETK_PACKAGE_DATA_DIR in config.h.
+etk_prefix="\"`etk-config --prefix`/share/etk\""
+AC_DEFINE_UNQUOTED(ETK_PACKAGE_DATA_DIR, $etk_prefix, [Data dir for etk lib.])
+
+etk_libs=`etk-config --libs`
+etk_cflags=`etk-config --cflags`
+
+# add required libs / include here
+my_includes="$etk_cflags"
+my_libs="$etk_libs"
+AC_SUBST(my_includes)
+AC_SUBST(my_libs)
-AC_CONFIG_SUBDIRS([entrance.edit])
AC_OUTPUT([
Makefile \
src/Makefile \
@@ -36,4 +129,3 @@
data/icons/48x48/devices/Makefile \
debian/changelog
])
-
-------------------------------------------------------------------------
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
