Menu
▾
▴
E CVS: libs/imlib2_loaders mej
|
From: <enl...@li...> - 2002-05-29 13:42:18
|
Enlightenment CVS committal
Author : mej
Project : e17
Module : libs/imlib2_loaders
Dir : e17/libs/imlib2_loaders
Modified Files:
Makefile.am config.h.in configure.ac configure.in
Log Message:
Wed May 29 09:41:14 2002 Michael Jennings (mej)
Merged changes from SPLIT into main trunk and removed SPLIT branch.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 24 Sep 2001 21:16:12 -0000 1.6
+++ Makefile.am 29 May 2002 13:41:40 -0000 1.7
@@ -10,6 +10,7 @@
CFLAGS_EXTRA = -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src
EXTRA_DIST = \
+acinclude.m4 \
imlib2_loaders.spec.in \
imlib2_loaders.spec
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- config.h.in 18 Jan 2002 19:31:42 -0000 1.4
+++ config.h.in 29 May 2002 13:41:40 -0000 1.5
@@ -1,7 +1,14 @@
-/* config.h.in. Generated automatically from configure.ac by autoheader. */
+/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* Define if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+/* Define to empty if the keyword does not work. */
+#undef const
+
+/* Define if your processor stores words with the most significant
+ byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Define if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
/* Name of package */
#undef PACKAGE
@@ -9,12 +16,3 @@
/* Version number of package */
#undef VERSION
-/* Define if your processor stores words with the most significant byte first
- (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- configure.ac 24 Sep 2001 21:16:12 -0000 1.3
+++ configure.ac 29 May 2002 13:41:40 -0000 1.4
@@ -29,6 +29,15 @@
fi
])
+AC_ARG_ENABLE(eet,
+[ --disable-eet disable building the eet loader],
+[
+ if test x$enableval = xno; then
+ eet=no;
+ EET_CONFIG_IN_PATH=disabled;
+ fi
+])
+
AC_ARG_ENABLE(xcf,
[ --disable-xcf disable building the xcf loader],
[
@@ -116,6 +125,50 @@
test \( $EDB_CONFIG_IN_PATH = yes -o \
$EDB_CONFIG_IN_PATH = ignored \) -a x$edb != xno )
+EET_CONFIG="eet-config"
+if test x$eet != xno; then
+ AC_ARG_WITH(eet,
+ [ --with-eet-config=PATH eet-config script to use (eg /usr/bin/eet-config)],
+ [
+ EET_CONFIG=$withval
+ AC_CHECK_PROG(EET_CONFIG_IN_PATH, $EET_CONFIG, yes, no)
+ if test $EET_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The eet-config development script you specified "
+ echo "($EET_CONFIG) was not found. Please check the path "
+ echo "and make sure the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no eet-config detected.])
+ exit;
+ fi
+ ],
+ [
+ AC_CHECK_PROG(EET_CONFIG_IN_PATH, $EET_CONFIG, yes, no)
+ if test $EET_CONFIG_IN_PATH = no; then
+ echo "WARNING:"
+ echo "------------------------------------------------------------------"
+ echo "The eet-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the eet-devel (or eet-dev)"
+ echo " packages."
+ echo "2. You may have edb installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the eet-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-eet-config."
+ echo "------------------------------------------------------------------"
+ AC_MSG_WARN([no eet-config detected.])
+ fi
+ ])
+else
+ AC_MSG_CHECKING([for eet-config])
+ AC_MSG_RESULT(disabled)
+fi
+
+AM_CONDITIONAL(EET_LOADER,
+ test \( $EET_CONFIG_IN_PATH = yes -o \
+ $EET_CONFIG_IN_PATH = ignored \) -a x$eet != xno )
+
AM_CONDITIONAL(XCF_LOADER, test x$xcf != xno )
imlib2_includes=`$IMLIB2_CONFIG --cflags`
@@ -126,10 +179,17 @@
edb_libs=`$EDB_CONFIG --libs`
fi
+if test x$eet != xno; then
+ eet_includes=`$EET_CONFIG --cflags`
+ eet_libs=`$EET_CONFIG --libs`
+fi
+
AC_SUBST(imlib2_includes)
AC_SUBST(imlib2_libs)
AC_SUBST(edb_includes)
AC_SUBST(edb_libs)
+AC_SUBST(eet_includes)
+AC_SUBST(eet_libs)
AC_OUTPUT([
Makefile
@@ -149,6 +209,13 @@
echo -n " Edb: "
if test x$EDB_LOADER_TRUE = "x#"; then
+ echo "Disabled "
+else
+ echo "Enabled "
+fi
+
+echo -n " Eet: "
+if test x$EET_LOADER_TRUE = "x#"; then
echo "Disabled "
else
echo "Enabled "
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- configure.in 24 Sep 2001 21:16:12 -0000 1.9
+++ configure.in 29 May 2002 13:41:40 -0000 1.10
@@ -29,6 +29,15 @@
fi
])
+AC_ARG_ENABLE(eet,
+[ --disable-eet disable building the eet loader],
+[
+ if test x$enableval = xno; then
+ eet=no;
+ EET_CONFIG_IN_PATH=disabled;
+ fi
+])
+
AC_ARG_ENABLE(xcf,
[ --disable-xcf disable building the xcf loader],
[
@@ -116,6 +125,50 @@
test \( $EDB_CONFIG_IN_PATH = yes -o \
$EDB_CONFIG_IN_PATH = ignored \) -a x$edb != xno )
+EET_CONFIG="eet-config"
+if test x$eet != xno; then
+ AC_ARG_WITH(eet,
+ [ --with-eet-config=PATH eet-config script to use (eg /usr/bin/eet-config)],
+ [
+ EET_CONFIG=$withval
+ AC_CHECK_PROG(EET_CONFIG_IN_PATH, $EET_CONFIG, yes, no)
+ if test $EET_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The eet-config development script you specified "
+ echo "($EET_CONFIG) was not found. Please check the path "
+ echo "and make sure the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no eet-config detected.])
+ exit;
+ fi
+ ],
+ [
+ AC_CHECK_PROG(EET_CONFIG_IN_PATH, $EET_CONFIG, yes, no)
+ if test $EET_CONFIG_IN_PATH = no; then
+ echo "WARNING:"
+ echo "------------------------------------------------------------------"
+ echo "The eet-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the eet-devel (or eet-dev)"
+ echo " packages."
+ echo "2. You may have edb installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the eet-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-eet-config."
+ echo "------------------------------------------------------------------"
+ AC_MSG_WARN([no eet-config detected.])
+ fi
+ ])
+else
+ AC_MSG_CHECKING([for eet-config])
+ AC_MSG_RESULT(disabled)
+fi
+
+AM_CONDITIONAL(EET_LOADER,
+ test \( $EET_CONFIG_IN_PATH = yes -o \
+ $EET_CONFIG_IN_PATH = ignored \) -a x$eet != xno )
+
AM_CONDITIONAL(XCF_LOADER, test x$xcf != xno )
imlib2_includes=`$IMLIB2_CONFIG --cflags`
@@ -126,10 +179,17 @@
edb_libs=`$EDB_CONFIG --libs`
fi
+if test x$eet != xno; then
+ eet_includes=`$EET_CONFIG --cflags`
+ eet_libs=`$EET_CONFIG --libs`
+fi
+
AC_SUBST(imlib2_includes)
AC_SUBST(imlib2_libs)
AC_SUBST(edb_includes)
AC_SUBST(edb_libs)
+AC_SUBST(eet_includes)
+AC_SUBST(eet_libs)
AC_OUTPUT([
Makefile
@@ -149,6 +209,13 @@
echo -n " Edb: "
if test x$EDB_LOADER_TRUE = "x#"; then
+ echo "Disabled "
+else
+ echo "Enabled "
+fi
+
+echo -n " Eet: "
+if test x$EET_LOADER_TRUE = "x#"; then
echo "Disabled "
else
echo "Enabled "
|