Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : language
Dir : e_modules/language
Modified Files:
configure.in
Log Message:
clean up configure scripts
===================================================================
RCS file: /cvs/e/e_modules/language/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- configure.in 11 Nov 2007 19:52:13 -0000 1.21
+++ configure.in 12 Nov 2007 21:09:03 -0000 1.22
@@ -3,19 +3,24 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
+AC_INIT(language, 0.0.1, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_ISC_POSIX
-AM_INIT_AUTOMAKE(language, 0.0.1)
+AM_INIT_AUTOMAKE(1.6)
AM_CONFIG_HEADER(config.h)
-AC_ISC_POSIX
+
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION(0.14)
@@ -24,120 +29,42 @@
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
-if test "x${bindir}" = 'x${exec_prefix}/bin'; then
- 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
-fi
-
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- 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
-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", "Package
installed binaries destination")
- else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", "Package installed
binaries destination")
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", "Package installed binaries
destination")
-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", "Package
installed libraries destination")
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed
libraries destination")
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed
libraries destination")
-fi
-
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}",
"Package installed data destination")
- datadir="${HOME}/.e/e/modules/${PACKAGE}"
-else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data
destination")
- datadir="${libdir}/enlightenment/modules/${PACKAGE}"
-fi
-
-AC_PREFIX_DEFAULT(${HOME}/.e/e)
-if test "x$prefix" = "xNONE"; then
- datarootdir=${ac_default_prefix}
-else
- datarootdir=${prefix}/share
-fi
-localedir=${datarootdir}/locale
-AC_SUBST(LOCALEDIR, "${localedir}")
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory])
-
-#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
-#AC_SUBST(dlopen_libs)
-
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
-
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)
-PKG_CHECK_MODULES(EXML, [exml >= 0.1.1])
+dnl TODO: Fix better install for homedir
+datadir="${e_modules}/${PACKAGE}"
-#AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your
CFLAGS environment variable contains include lines for the location of this
file and EXML lib is installed]))
+PKG_CHECK_MODULES(EXML, [exml >= 0.1.1])
AC_CHECK_HEADERS(X11/XKBlib.h, ,
AC_MSG_ERROR([Cannot find XKBlib.h. Make sure your CFLAGS
environment variable contains include lines for the location of this file.]))
-AC_CHECK_HEADERS(X11/extensions/XKBrules.h,, AC_MSG_ERROR([Cannot find
XKBrules.h. Make sure your CFLAGS environment variable contains include lines
for the location of this file.]),
+AC_CHECK_HEADERS(X11/extensions/XKBrules.h, ,
+ AC_MSG_ERROR([Cannot find XKBrules.h. Make sure your CFLAGS
environment variable contains include lines for the location of this file.]),
[
#include <stdio.h>
#include <X11/XKBlib.h>
@@ -152,6 +79,6 @@
data/themes/Makefile
data/themes/images/Makefile
po/Makefile.in
-],[
+], [
])
-------------------------------------------------------------------------
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
