hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use AC_PATH_GENERIC 

SVN revision: 16495
This commit is contained in:
sebastid 2005-09-03 19:42:28 +00:00 committed by sebastid
parent e260c571a6
commit fd37cb5ac3
17 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/evas/configure.in
View File

@ -115,15 +115,10 @@ AC_ARG_WITH(qtdir,
qt_dir="/opt/Qtopia";
])
# check for freetype
AC_ARG_WITH(freetype-config, [ --with-freetype-config=FREETYPE_CONFIG use freetype-config specified ],
[ FREETYPE_CONFIG=$withval;
echo "using "$FREETYPE_CONFIG" for freetype-config"; ],
[ if test -z "$FREETYPE_CONFIG"; then
AC_PATH_PROG(FREETYPE_CONFIG, "freetype-config", "", $PATH)
fi
])
freetype_cflags=`$FREETYPE_CONFIG --cflags`
freetype_libs=`$FREETYPE_CONFIG --libs`
AC_PATH_GENERIC(freetype, 9.8.0,
[ ],
[ AC_MSG_ERROR(Freetype isn't installed) ]
)
#####################################################################
## Engines
@ -1492,9 +1487,6 @@ fi
AC_SUBST(VALGRIND_CFLAGS)
AC_SUBST(VALGRIND_LIBS)
AC_SUBST(freetype_cflags)
AC_SUBST(freetype_libs)
AC_SUBST(x_cflags)
AC_SUBST(x_libs)

4
legacy/evas/src/lib/Makefile.am
View File

@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @xcb_cflags@ @qt_cflags@ @DIRECTFB_CFLAGS@ @gl_cflags@
@FREETYPE_CFLAGS@ @x_cflags@ @xcb_cflags@ @qt_cflags@ @DIRECTFB_CFLAGS@ @gl_cflags@
lib_LTLIBRARIES = libevas.la
@ -125,7 +125,7 @@ libevas_la_LIBADD = \
imaging/libevas_imaging.la \
engines/common/libevas_engine_common.la \
-lm \
@freetype_libs@ \
@FREETYPE_LIBS@ \
@png_libs@ @jpeg_libs@ @eet_libs@ @edb_libs@ \
$(ENGINE_SOFTWARE_X11) \
$(ENGINE_SOFTWARE_XCB) \

2
legacy/evas/src/lib/canvas/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @DIRECTFB_CFLAGS@ \
@FREETYPE_CFLAGS@ @x_cflags@ @DIRECTFB_CFLAGS@ \
@eet_cflags@
noinst_LTLIBRARIES = libevas_canvas.la

2
legacy/evas/src/lib/data/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
@FREETYPE_CFLAGS@
noinst_LTLIBRARIES = libevas_data.la
libevas_data_la_SOURCES = \

2
legacy/evas/src/lib/engines/buffer/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
@FREETYPE_CFLAGS@
if BUILD_ENGINE_BUFFER

2
legacy/evas/src/lib/engines/cairo_common/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @CAIRO_CFLAGS@
@FREETYPE_CFLAGS@ @CAIRO_CFLAGS@
if BUILD_ENGINE_CAIRO_COMMON

2
legacy/evas/src/lib/engines/cairo_x11/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @CAIRO_CFLAGS@
@FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@
if BUILD_ENGINE_CAIRO_X11

2
legacy/evas/src/lib/engines/common/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @VALGRIND_CFLAGS@ \
@FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
@eet_cflags@ @edb_cflags@
noinst_LTLIBRARIES = libevas_engine_common.la

2
legacy/evas/src/lib/engines/directfb/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @DIRECTFB_CFLAGS@
@FREETYPE_CFLAGS@ @DIRECTFB_CFLAGS@
if BUILD_ENGINE_DIRECTFB

2
legacy/evas/src/lib/engines/fb/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
@FREETYPE_CFLAGS@
if BUILD_ENGINE_FB

2
legacy/evas/src/lib/engines/gl_common/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @gl_cflags@
@FREETYPE_CFLAGS@ @gl_cflags@
if BUILD_ENGINE_GL_COMMON

2
legacy/evas/src/lib/engines/gl_x11/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@ @gl_cflags@
@FREETYPE_CFLAGS@ @x_cflags@ @gl_cflags@
if BUILD_ENGINE_GL_X11

2
legacy/evas/src/lib/engines/software_qtopia/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @qt_cflags@
@FREETYPE_CFLAGS@ @qt_cflags@
CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG

2
legacy/evas/src/lib/engines/software_x11/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @x_cflags@
@FREETYPE_CFLAGS@ @x_cflags@
if BUILD_ENGINE_SOFTWARE_X11

2
legacy/evas/src/lib/engines/software_xcb/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ @xcb_cflags@
@FREETYPE_CFLAGS@ @xcb_cflags@
if BUILD_ENGINE_SOFTWARE_XCB

2
legacy/evas/src/lib/file/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@
@FREETYPE_CFLAGS@
noinst_LTLIBRARIES = libevas_file.la
libevas_file_la_SOURCES = \

2
legacy/evas/src/lib/imaging/Makefile.am
View File

@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@freetype_cflags@ \
@FREETYPE_CFLAGS@ \
@eet_cflags@
noinst_LTLIBRARIES = libevas_imaging.la