Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in
Log Message:
Simplify the configure.in and fix for autoconf 2.60 by switching to
ac_define_dir.m4.
Update paths relative to the new package base directories.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/configure.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- configure.in 24 Oct 2006 20:53:04 -0000 1.87
+++ configure.in 26 Oct 2006 16:11:54 -0000 1.88
@@ -25,44 +25,20 @@
esac
dnl Set PACKAGE_LOCALE_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${PACKAGE}/locale", [Locale data directory])
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${PACKAGE}/locale",
[Locale data directory])
-fi
+# if test "x${prefix}" = "xNONE"; then
+# AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${PACKAGE}/locale", [Locale data directory])
+# else
+# AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${PACKAGE}/locale",
[Locale data directory])
+# fi
dnl Set PACKAGE_SYSCONF_DIR in config.h.
-if test "x${sysconfdir}" = 'x${prefix}/etc'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${ac_default_prefix}/etc",
[System Configuration Directory])
- else
- AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${prefix}/etc", [System
Configuration Directory])
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${sysconfdir}", [System
Configuration Directory])
-fi
+AC_DEFINE_DIR([PACKAGE_SYSCONF_DIR], [sysconfdir], [System Configuration
Directory.])
dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
- 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
-else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [Shared Data Directory])
-fi
+AC_DEFINE_DIR([PACKAGE_DATA_DIR], [datadir], [Shared Data Directory.])
dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib/${PACKAGE}",
[Library module directory])
- else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib/${PACKAGE}", [Library
module directory])
- fi
-else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}/${PACKAGE}", [Library module
directory])
-fi
+AC_DEFINE_DIR([PACKAGE_LIB_DIR], [libdir], [Library Module Directory.])
dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
-------------------------------------------------------------------------
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
