Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : moon
Dir : e_modules/moon
Modified Files:
configure.ac
Log Message:
clean up configure scripts
===================================================================
RCS file: /cvs/e/e_modules/moon/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- configure.ac 11 Nov 2007 19:55:55 -0000 1.15
+++ configure.ac 12 Nov 2007 21:09:03 -0000 1.16
@@ -3,16 +3,35 @@
rm -f config.cache
+AC_INIT(moon, 0.2.2, [EMAIL PROTECTED])
AC_PREREQ(2.59)
-AC_INIT(moon, 0.2.2)
-AC_CONFIG_SRCDIR([src/e_mod_main.c])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_SRCDIR(src/e_mod_main.c)
+AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_ISC_POSIX
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(1.6)
+AM_CONFIG_HEADER(config.h)
-# Checks for programs.
AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+AC_C_CONST
+
+# Checks for header files.
+AC_CHECK_HEADERS([limits.h string.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_STRUCT_TM
+
+# Checks for library functions.
+AC_CHECK_FUNCS([sqrt strdup])
+
+MODULE_ARCH="$host_os-$host_cpu"
+AC_SUBST(MODULE_ARCH)
+
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
AM_GNU_GETTEXT([external])
@@ -21,60 +40,32 @@
# Checks for libraries.
edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
AC_ARG_WITH(edje-cc,
-[ --with-edje-cc=PATH specify a specific path to edje_cc],
-[
- v=$withval;
- edje_cc=$v
- echo " Enlightenment edje_cc explicitly set to "$edje_cc;
-],[
- edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
-])
+ AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
+ [
+ edje_cc=$withval;
+ echo " Enlightenment edje_cc explicitly set to "$edje_cc;
+ ]
+)
AC_SUBST(edje_cc)
AC_ARG_WITH(enlightenment-config,
-[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified
],
-[
- E_CONFIG=$withval;
- echo "using "$E_CONFIG" for enlightenment-config";
-],[
- PROG="enlightenment-config";
- AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
-])
+ AC_HELP_STRING([--with-enlightenment-config=E_CONFIG], [use
enlightenment-config specified]),
+ [
+ E_CONFIG=$withval;
+ echo "using "$E_CONFIG" for enlightenment-config";
+ ], [
+ PROG="enlightenment-config";
+ AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH)
+ ]
+)
e_cflags=`$E_CONFIG --cflags`
e_libs=`$E_CONFIG --libs`
e_modules=`$E_CONFIG --module-dir`
AC_SUBST(e_cflags)
AC_SUBST(e_libs)
-AC_SUBST(e_modules)
-MODULE_ARCH="$host_os-$host_cpu"
-AC_SUBST(MODULE_ARCH)
-
-AC_PREFIX_DEFAULT(${HOME}/.e/e)
-if test "x$prefix" = "xNONE"; then
- prefix=${ac_default_prefix}
- datarootdir=${prefix}
- moduledir=${prefix}/modules
-else
- datarootdir=${prefix}/share
- moduledir=${libdir}/enlightenment/modules
-fi
-AC_SUBST(MODULEDIR, "${moduledir}")
-
-localedir=${datarootdir}/locale
-AC_SUBST(LOCALEDIR, "${localedir}")
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory])
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([limits.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_STRUCT_TM
-
-# Checks for library functions.
-AC_CHECK_FUNCS([sqrt strdup])
+dnl TODO: Fix better install for homedir
+datadir="${e_modules}/${PACKAGE}"
AC_CONFIG_FILES([Makefile
e_modules-moon.spec
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
