Enlightenment CVS committal
Author : vapier
Project : misc
Module : enotes
Dir : misc/enotes
Modified Files:
configure.in
Removed Files:
acconfig.h
Log Message:
update autotool code
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in 13 Oct 2005 23:29:21 -0000 1.6
+++ configure.in 25 Oct 2005 00:55:45 -0000 1.7
@@ -22,55 +22,52 @@
dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${DATADIRNAME}/locale")
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR,
"${ac_default_prefix}/${DATADIRNAME}/locale", [PACKAGE_LOCALE_DIR])
else
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale",
[PACKAGE_LOCALE_DIR])
fi
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}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR])
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}",
[PACKAGE_DATA_DIR])
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}",
[PACKAGE_DATA_DIR])
fi
dnl Set PACKAGE_BIN_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/bin'; then
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin")
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin",
[PACKAGE_BIN_DIR])
else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin")
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [PACKAGE_BIN_DIR])
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [PACKAGE_BIN_DIR])
fi
dnl Set PACKAGE_LIB_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/lib'; then
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib")
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib",
[PACKAGE_LIB_DIR])
else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib")
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [PACKAGE_LIB_DIR])
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}")
+ AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [PACKAGE_LIB_DIR])
fi
dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}",
[PACKAGE_SOURCE_DIR])
PROG="ewl-config";
AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH)
-if [ test -z $EWL_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$EWL_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
ewl_cflags=`$EWL_CONFIG --cflags`
ewl_libs=`$EWL_CONFIG --libs`
@@ -79,11 +76,8 @@
PROG="evas-config";
AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
-if [ test -z $EVAS_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$EVAS_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
evas_cflags=`$EVAS_CONFIG --cflags`
evas_libs=`$EVAS_CONFIG --libs`
@@ -92,11 +86,8 @@
PROG="ecore-config";
AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
-if [ test -z $ECORE_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$ECORE_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
ecore_cflags=`$ECORE_CONFIG --cflags`
ecore_libs=`$ECORE_CONFIG --libs`
@@ -105,11 +96,8 @@
PROG="imlib2-config";
AC_PATH_PROG(IMLIB2_CONFIG, $PROG, "", $PATH)
-if [ test -z $IMLIB2_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$IMLIB2_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
imlib2_cflags=`$IMLIB2_CONFIG --cflags`
imlib2_libs=`$IMLIB2_CONFIG --libs`
@@ -119,11 +107,8 @@
PROG="edje-config";
AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH)
-if [ test -z $EDJE_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$EDJE_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
edje_cflags=`$EDJE_CONFIG --cflags`
edje_libs=`$EDJE_CONFIG --libs`
@@ -133,11 +118,8 @@
PROG="edb-config";
AC_PATH_PROG(EDB_CONFIG, $PROG, "", $PATH)
-if [ test -z $EDB_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$EDB_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
edb_cflags=`$EDB_CONFIG --cflags`
edb_libs=`$EDB_CONFIG --libs`
@@ -147,17 +129,15 @@
PROG="esmart-config";
AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH)
-if [ test -z $ESMART_CONFIG ]; then
- echo $PROG " is not in your \$PATH. Please ensure it is.";
- echo "Read the manual page for you shell as to how to extend your path.";
- echo "FATAL ERROR. ABORT.";
- exit -1;
+if test -z "$ESMART_CONFIG" ; then
+ AC_MSG_ERROR($PROG is not in your \$PATH. Please ensure it is.)
fi
esmart_cflags=`$ESMART_CONFIG --cflags`
esmart_libs=`$ESMART_CONFIG --libs`
AC_SUBST(esmart_cflags)
AC_SUBST(esmart_libs)
+CFLAGS="-Wall $CFLAGS"
AC_OUTPUT([
Makefile
@@ -170,4 +150,3 @@
data/themes/postit/Makefile
debian/changelog
])
-
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs