Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/imlib2_loaders
Dir : e17/libs/imlib2_loaders
Modified Files:
configure.in acinclude.m4
Log Message:
cleaned up autotools files
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- configure.in 16 Apr 2004 05:24:52 -0000 1.11
+++ configure.in 17 Apr 2004 20:38:00 -0000 1.12
@@ -24,7 +24,6 @@
[
if test x$enableval = xno; then
edb=no;
- EDB_CONFIG_IN_PATH=disabled;
fi
])
@@ -33,7 +32,6 @@
[
if test x$enableval = xno; then
eet=no;
- EET_CONFIG_IN_PATH=disabled;
fi
])
@@ -45,150 +43,24 @@
fi
])
-#Set the default
-IMLIB2_CONFIG="imlib2-config"
-AC_ARG_WITH(imlib2,
-[ --with-imlib2-config=FILE imlib2-config script to use (eg
/usr/bin/imlib2-config)],
-[
- IMLIB2_CONFIG=$withval
- AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, $IMLIB2_CONFIG, yes, no)
- if test $IMLIB2_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The imlib2-config development script you specified "
- echo "($IMLIB2_CONFIG) was not found. Please check the path "
- echo "and make sure the script exists and is executable."
- AC_MSG_ERROR([Fatal Error: no imlib2-config detected.])
- exit;
- fi
-],
-[
- AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, $IMLIB2_CONFIG, yes, no)
- if test $IMLIB2_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The imlib2-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 Imlib2-devel (or Imlib2-dev)"
- echo " packages."
- echo "2. You may have Imlib2 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 imlib2-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-imlib2-config."
- AC_MSG_ERROR([Fatal Error: no imlib2-config detected.])
- exit;
- fi
-])
-
-EDB_CONFIG="edb-config"
-if test x$edb != xno; then
- AC_ARG_WITH(edb,
- [ --with-edb-config=PATH edb-config script to use (eg /usr/bin/edb-config)],
- [
- EDB_CONFIG=$withval
- AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no)
- if test $EDB_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The edb-config development script you specified "
- echo "($EDB_CONFIG) was not found. Please check the path "
- echo "and make sure the script exists and is executable."
- AC_MSG_ERROR([Fatal Error: no edb-config detected.])
- exit;
- fi
- ],
- [
- AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no)
- if test $EDB_CONFIG_IN_PATH = no; then
- echo "WARNING:"
- echo "------------------------------------------------------------------"
- echo "The edb-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 edb-devel (or edb-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 edb-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-edb-config."
- echo "------------------------------------------------------------------"
- AC_MSG_WARN([no edb-config detected.])
- fi
- ])
-else
- AC_MSG_CHECKING([for edb-config])
- AC_MSG_RESULT(disabled)
-fi
-
-AM_CONDITIONAL(EDB_LOADER,
- 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`
-imlib2_libs=`$IMLIB2_CONFIG --libs`
+AC_PATH_GENERIC(imlib2, , ,
+ AC_MSG_ERROR(Imlib2 not found))
if test x$edb != xno; then
- edb_includes=`$EDB_CONFIG --cflags`
- edb_libs=`$EDB_CONFIG --libs`
+ AC_PATH_GENERIC(edb, , , [
+ AC_MSG_WARN([edb-config not found])
+ edb=no])
fi
if test x$eet != xno; then
- eet_includes=`$EET_CONFIG --cflags`
- eet_libs=`$EET_CONFIG --libs`
+ AC_PATH_GENERIC(eet, , , [
+ AC_MSG_WARN([eet-config not found])
+ eet=no])
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)
+AM_CONDITIONAL(EDB_LOADER, test x$edb != xno)
+AM_CONDITIONAL(EET_LOADER, test x$eet != xno)
+AM_CONDITIONAL(XCF_LOADER, test x$xcf != xno)
AC_OUTPUT([
Makefile
@@ -200,21 +72,21 @@
echo -e "\nBuild summary:"
echo "------------------------"
echo -n " XCF: "
-if test x$XCF_LOADER_TRUE = "x#"; then
+if test x$xcf = xno ; then
echo "Disabled "
else
echo "Enabled "
fi
echo -n " Edb: "
-if test x$EDB_LOADER_TRUE = "x#"; then
+if test x$edb = xno; then
echo "Disabled "
else
echo "Enabled "
fi
echo -n " Eet: "
-if test x$EET_LOADER_TRUE = "x#"; then
+if test x$eet = xno; then
echo "Disabled "
else
echo "Enabled "
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- acinclude.m4 6 Oct 2001 17:50:41 -0000 1.1
+++ acinclude.m4 17 Apr 2004 20:38:00 -0000 1.2
@@ -1 +1,136 @@
-sinclude(ac_path_elib.m4)
+dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND]]])
+dnl
+dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS
+dnl
+dnl The script must support `--cflags' and `--libs' args.
+dnl If MINIMUM-VERSION is specified, the script must also support the
+dnl `--version' arg.
+dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given,
+dnl it must also support `--prefix' and `--exec-prefix'.
+dnl (In other words, it must be like gtk-config.)
+dnl
+dnl For example:
+dnl
+dnl AC_PATH_GENERIC(Foo, 1.0.0)
+dnl
+dnl would run `foo-config --version' and check that it is at least 1.0.0
+dnl
+dnl If so, the following would then be defined:
+dnl
+dnl FOO_CFLAGS to `foo-config --cflags`
+dnl FOO_LIBS to `foo-config --libs`
+dnl
+dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
+dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
+dnl
+dnl @author Angus Lees <[EMAIL PROTECTED]>
+
+AC_DEFUN(AC_PATH_GENERIC,
+[dnl
+dnl we're going to need uppercase, lowercase and user-friendly versions of the
+dnl string `LIBRARY'
+pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
+pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
+
+dnl
+dnl Get the cflags and libraries from the LIBRARY-config script
+dnl
+AC_ARG_WITH(DOWN-prefix,[ --with-]DOWN[-prefix=PFX Prefix where $1 is
installed (optional)],
+ DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="")
+AC_ARG_WITH(DOWN-exec-prefix,[ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is
installed (optional)],
+ DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="")
+
+ if test x$DOWN[]_config_exec_prefix != x ; then
+ DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix"
+ if test x${UP[]_CONFIG+set} != xset ; then
+ UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config
+ fi
+ fi
+ if test x$DOWN[]_config_prefix != x ; then
+ DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix"
+ if test x${UP[]_CONFIG+set} != xset ; then
+ UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config
+ fi
+ fi
+
+ AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no)
+ ifelse([$2], ,
+ AC_MSG_CHECKING(for $1),
+ AC_MSG_CHECKING(for $1 - version >= $2)
+ )
+ no_[]DOWN=""
+ if test "$UP[]_CONFIG" = "no" ; then
+ no_[]DOWN=yes
+ else
+ UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`"
+ UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`"
+ ifelse([$2], , ,[
+ DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \
+ --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \
+ --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \
+ --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])"
+ DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])"
+ DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)],
[\3])"
+
+ # Compare wanted version to what config script returned.
+ # If I knew what library was being run, i'd probably also compile
+ # a test program at this point (which also extracted and tested
+ # the version in some library-specific way)
+ if test "$DOWN[]_config_major_version" -lt \
+ "$DOWN[]_wanted_major_version" \
+ -o \( "$DOWN[]_config_major_version" -eq \
+ "$DOWN[]_wanted_major_version" \
+ -a "$DOWN[]_config_minor_version" -lt \
+ "$DOWN[]_wanted_minor_version" \) \
+ -o \( "$DOWN[]_config_major_version" -eq \
+ "$DOWN[]_wanted_major_version" \
+ -a "$DOWN[]_config_minor_version" -eq \
+ "$DOWN[]_wanted_minor_version" \
+ -a "$DOWN[]_config_micro_version" -lt \
+ "$DOWN[]_wanted_micro_version" \) ; then
+ # older version found
+ no_[]DOWN=yes
+ echo -n "*** An old version of $1 "
+ echo -n "($DOWN[]_config_major_version"
+ echo -n ".$DOWN[]_config_minor_version"
+ echo ".$DOWN[]_config_micro_version) was found."
+ echo -n "*** You need a version of $1 newer than "
+ echo -n "$DOWN[]_wanted_major_version"
+ echo -n ".$DOWN[]_wanted_minor_version"
+ echo ".$DOWN[]_wanted_micro_version."
+ echo "***"
+ echo "*** If you have already installed a sufficiently new version, this
error"
+ echo "*** probably means that the wrong copy of the DOWN-config shell
script is"
+ echo "*** being found. The easiest way to fix this is to remove the old
version"
+ echo "*** of $1, but you can also set the UP[]_CONFIG environment to point
to the"
+ echo "*** correct copy of DOWN-config. (In this case, you will have to"
+ echo "*** modify your LD_LIBRARY_PATH environment variable, or edit
/etc/ld.so.conf"
+ echo "*** so that the correct libraries are found at run-time)"
+ fi
+ ])
+ fi
+ if test "x$no_[]DOWN" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], , :, [$3])
+ else
+ AC_MSG_RESULT(no)
+ if test "$UP[]_CONFIG" = "no" ; then
+ echo "*** The DOWN-config script installed by $1 could not be found"
+ echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the UP[]_CONFIG environment variable to the"
+ echo "*** full path to DOWN-config."
+ fi
+ UP[]_CFLAGS=""
+ UP[]_LIBS=""
+ ifelse([$4], , :, [$4])
+ fi
+ AC_SUBST(UP[]_CFLAGS)
+ AC_SUBST(UP[]_LIBS)
+
+ popdef([UP])
+ popdef([DOWN])
+])
+
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
