diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am index 5739707aef..45fea275ca 100644 --- a/legacy/evas/Makefile.am +++ b/legacy/evas/Makefile.am @@ -11,4 +11,6 @@ MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess \ SUBDIRS = src test +bin_SCRIPTS = evas-config + EXTRA_DIST = README AUTHORS COPYING diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index 37dd475dca..52c0a7c845 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -40,11 +40,6 @@ AC_CHECK_LIB(Xext, XShapeCombineMask, x_libs="-lXext $x_libs", AC_MSG_ERROR([ERROR: XShape not found.]); exit, $x_libs) -AC_SUBST(x_cflags) -AC_SUBST(x_includes) -AC_SUBST(x_ldflags) -AC_SUBST(x_libs) - #### Find out about E db #AC_CHECK_HEADER(Edb.h, #AC_CHECK_LIB(edb, e_db_open, ,[ @@ -113,6 +108,9 @@ AC_CHECK_LIB(GL, glBindTexture, have_gl=yes,[ ], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) ) if test "x$have_gl" = "xyes"; then + gl_includes=$gl_includes" -I/usr/include -I/usr/local/include" + gl_ldflags=$gl_ldflags" -L/usr/local/lib" + gl_libs=$gl_libs" -lGL" AC_DEFINE(HAVE_GL) AC_TRY_CPP(GL/glu.h, echo "checking for GL/glu.h... yes" @@ -121,6 +119,9 @@ if test "x$have_gl" = "xyes"; then ], -L/usr/local/lib -lGL -lGLU $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) ) if test "x$have_glu" = "xyes"; then + gl_includes=$gl_includes" -I/usr/include -I/usr/local/include" + gl_ldflags=$gl_ldflags" -L/usr/local/lib" + gl_libs=$gl_libs" -lGLU" AC_DEFINE(HAVE_GLU) else echo "WARNING:......." @@ -138,6 +139,21 @@ else fi CPPFLAGS=$PREV_CPPFLAGS -AC_SUBST(gl_includes) +imlib2_inlcudes=`imlib2-config --cflags` +imlib2_libs=`imlib2-config --libs` -AC_OUTPUT(Makefile src/Makefile test/Makefile) +AC_SUBST(x_cflags) +AC_SUBST(x_includes) +AC_SUBST(x_ldflags) +AC_SUBST(x_libs) +AC_SUBST(gl_includes) +AC_SUBST(gl_ldflags) +AC_SUBST(gl_libs) +AC_SUBST(imlib2_includes) +AC_SUBST(imlib2_libs) + +AC_OUTPUT([ +Makefile src/Makefile test/Makefile evas-config +], [ +chmod +x evas-config +]) diff --git a/legacy/evas/evas-config.in b/legacy/evas/evas-config.in new file mode 100644 index 0000000000..6331c29e1a --- /dev/null +++ b/legacy/evas/evas-config.in @@ -0,0 +1,61 @@ +#!/bin/sh + +etxra_libs="@x_cflags@ @x_includes@ @gl_includes@" + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +exec_prefix_set=no + +usage="\ +Usage: evas-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" + +if test $# -eq 0; then + echo "${usage}" 1>&2 + exit 1 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo $prefix + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo $exec_prefix + ;; + --version) + echo @VERSION@ + ;; + --cflags) + if test @includedir@ != /usr/include ; then + includes=-I@includedir@ + fi + echo $includes @X_CFLAGS@ @imlib2_includes@ + ;; + --libs) + libdirs=-L@libdir@ + echo $libdirs -levas $extra_libs @LDFLAGS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @imlib2_libs@ + ;; + *) + echo "${usage}" 1>&2 + exit 1 + ;; + esac + shift +done + +exit 0 diff --git a/legacy/evas/src/Makefile.am b/legacy/evas/src/Makefile.am index 10eac1dc0b..b5ef1c77fd 100644 --- a/legacy/evas/src/Makefile.am +++ b/legacy/evas/src/Makefile.am @@ -6,13 +6,13 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in LIBS_X = @x_ldflags@ @x_libs@ -LIBS_IMLIB2 = -lImlib2 -lttf -ldl -lm +LIBS_IMLIB2 = @imlib2_libs@ #LIBS_DB = -ledb -LIBS_GL = -lGLU -lGL +LIBS_GL = @gl_ldflags@ @gl_libs@ LIBS_EXTRA = -L/usr/local/lib CFLAGS_X = @x_cflags@ -CFLAGS_IMLIB2 = +CFLAGS_IMLIB2 = @imlib2_includes@ #CFLAGS_DB = CFLAGS_GL = @gl_includes@ CFLAGS_EXTRA = -I$(includedir) -I$(top_srcdir) -I/usr/local/include