Enlightenment CVS committal
Author : doursse
Project : e17
Module : apps/edje_viewer
Dir : e17/apps/edje_viewer
Modified Files:
Makefile.am configure.in
Log Message:
* autotools improvements
* make conf.* files etk-independent (Etk_Bool -> unsigned char)
* fix warnings
===================================================================
RCS file: /cvs/e/e17/apps/edje_viewer/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 19 Jun 2006 16:14:53 -0000 1.2
+++ Makefile.am 6 May 2008 06:36:06 -0000 1.3
@@ -1,6 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.7 foreign
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
===================================================================
RCS file: /cvs/e/e17/apps/edje_viewer/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in 24 Mar 2007 12:16:55 -0000 1.4
+++ configure.in 6 May 2008 06:36:06 -0000 1.5
@@ -3,16 +3,14 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
-
+AC_INIT(edje_viewer, 0.0.1, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(edje_viewer, 0.0.1)
-
-AC_PREREQ(2.52)
-
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX
@@ -20,75 +18,32 @@
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 Checking for __attribute__ support
+AC_MSG_CHECKING([for __attribute__])
+AC_CACHE_VAL(_cv_have___attribute__,
+ [
+ AC_TRY_COMPILE([#include <stdlib.h>],
+ [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
+ [_cv_have___attribute__="yes"],
+ [_cv_have___attribute__="no"])
+ ]
+)
-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])
+if test "x${_cv_have___attribute__}" = "xyes" ; then
+ AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has
__attribute__])
fi
+AC_MSG_RESULT(${_cv_have___attribute__})
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code
Directory])
-
-PKG_CHECK_MODULES(evas, [evas >= 0.9.9])
-PKG_CHECK_MODULES(ecore, [ecore >= 0.9.9 ecore-config >= 0.9.9.037])
-PKG_CHECK_MODULES(edje, [edje >= 0.5.0])
-PKG_CHECK_MODULES(etk, [etk >= 0.1.0.001])
+PKG_CHECK_MODULES(EDJE_VIEWER,
+ [
+ evas >= 0.9.9
+ ecore >= 0.9.9
+ ecore-config >= 0.9.9
+ edje >= 0.5.0
+ etk >= 0.1.0.001
+ ]
+)
AC_OUTPUT([
Makefile
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
