Enlightenment CVS committal

Author  : englebass
Project : e_modules
Module  : net

Dir     : e_modules/net


Modified Files:
        configure.in 


Log Message:
clean up configure scripts

===================================================================
RCS file: /cvs/e/e_modules/net/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- configure.in        7 Nov 2007 21:49:46 -0000       1.21
+++ configure.in        12 Nov 2007 21:09:03 -0000      1.22
@@ -1,17 +1,23 @@
 rm -f config.cache
 
+AC_INIT(net, 0.0.1, [EMAIL PROTECTED])
 AC_PREREQ(2.59)
-AC_INIT([net], [0.0.1], [EMAIL PROTECTED])
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.8 foreign])
-
+AC_CONFIG_SRCDIR(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
+AC_ISC_POSIX
+
+AM_INIT_AUTOMAKE(1.6)
+AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
-AM_PROG_LIBTOOL
+AM_PROG_CC_STDC
 AC_HEADER_STDC
+AC_C_CONST
+
+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)
@@ -20,88 +26,40 @@
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
-# Check Library Directory
-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
-
-#
-# Set Library Directory 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 
libraries destination")
-   else
-      AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package libraries 
destination")
-   fi
-else
-   AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package libraries 
destination")
-fi
-
-#
-# Set Data Directory in config.h
-#
-if test "x${prefix}" = "xNONE"; then
-   datadir="${HOME}/.e/e/modules/${PACKAGE}"
-else
-   datadir="${libdir}/enlightenment/modules/${PACKAGE}"
-fi
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", "Package data destination")
-
-#
-# Set Data Root and Locale Directory in config.h
-#
-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")
-
-#
-# Check EFL Libs
-#
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
-AC_PATH_PROG(EDJE_CC, "edje_cc", "", $PATH)
-
-#
-# Check Enlightenment
-#
+edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc"
+AC_ARG_WITH(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)
+
+dnl TODO: Fix better install for homedir
+datadir="${e_modules}/${PACKAGE}"    
 
 AC_OUTPUT([
 Makefile
 src/Makefile
 po/Makefile.in
 e_modules-net.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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to