summaryrefslogtreecommitdiff
path: root/legacy/edje
diff options
context:
space:
mode:
authortsauerbeck <tsauerbeck>2004-10-20 18:42:36 +0000
committertsauerbeck <tsauerbeck@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2004-10-20 18:42:36 +0000
commit4873a7d260a2e34c15392f1c08eb4bd39e191e2f (patch)
treeeea024c9ebca592fd4fa1cd3890a7bd26595414f /legacy/edje
parentf83c81433d13b8ef082947e7641fff342bd9dac2 (diff)
imlib2 is optional for edje_cc now. simplified autofoo
SVN revision: 11927
Diffstat (limited to 'legacy/edje')
-rw-r--r--legacy/edje/configure.in90
-rw-r--r--legacy/edje/src/bin/Makefile.am12
-rw-r--r--legacy/edje/src/bin/edje_cc_out.c2
-rw-r--r--legacy/edje/src/lib/Makefile.am12
4 files changed, 39 insertions, 77 deletions
diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index 7bf52b3004..d208cc78d0 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -151,81 +151,42 @@ AC_SUBST(EDJE_CC_PRG)
151AC_SUBST(EDJE_DECC_PRG) 151AC_SUBST(EDJE_DECC_PRG)
152 152
153AC_ARG_WITH(eet, 153AC_ARG_WITH(eet,
154 [ --with-eet=DIR use eet in <DIR>], 154 [ --with-eet=DIR use eet in <DIR>],
155 [CFLAGS="$CFLAGS -I$withval/include" 155 [CFLAGS="$CFLAGS -I$withval/include"
156 LIBS="-L$withval/lib $LIBS"]) 156 LIBS="-L$withval/lib $LIBS"])
157
158have_eet="no";
159AC_CHECK_HEADER(Eet.h,
160 [ have_eet="yes" ],
161 [ have_eet="no" ]
162)
163
164if test "x$have_eet" = "xyes"; then
165 if [ test -z "$EET_CONFIG" ]; then EET_CONFIG="eet-config"; fi
166 eet_cflags=`$EET_CONFIG --cflags`
167 eet_libs=`$EET_CONFIG --libs`
168else
169 AC_MSG_ERROR(Cannot find Eet.h)
170 exit -1
171fi
172
173AC_SUBST(eet_cflags)
174AC_SUBST(eet_libs)
175 157
176have_embryo="no"; 158AC_PATH_GENERIC(eet, , ,
177AC_CHECK_HEADER(Embryo.h, 159 AC_MSG_ERROR(Cannot find eet: Is eet-config in path?))
178 [ have_embryo="yes" ],
179 [ have_embryo="no" ]
180)
181 160
182if test "x$have_embryo" = "xyes"; then 161AC_ARG_WITH(embryo,
183 if [ test -z "$EMBRYO_CONFIG" ]; then EMBRYO_CONFIG="embryo-config"; fi 162 [ --with-embryo=DIR use embryo in <DIR>],
184 embryo_cflags=`$EMBRYO_CONFIG --cflags` 163 [CFLAGS="$CFLAGS -I$withval/include"
185 embryo_libs=`$EMBRYO_CONFIG --libs` 164 LIBS="-L$withval/lib $LIBS"])
186else
187 AC_MSG_ERROR(Cannot find Embryo.h)
188 exit -1
189fi
190 165
191AC_SUBST(embryo_cflags) 166AC_PATH_GENERIC(embryo, 0.9.1, ,
192AC_SUBST(embryo_libs) 167 AC_MSG_ERROR(Cannot find embryo: Is embryo-config in path?))
193 168
194imlib2_cflags=""
195imlib2_libs=""
196if test "x$have_edje_cc" = "xyes"; then 169if test "x$have_edje_cc" = "xyes"; then
197 AC_ARG_WITH(imlib2, 170 AC_ARG_WITH(imlib2,
198 [ --with-imlib2=DIR use imlib2 in <DIR>], 171 [ --with-imlib2=DIR use imlib2 in <DIR>],
199 [CFLAGS="$CFLAGS -I$withval/include" 172 [CFLAGS="$CFLAGS -I$withval/include"
200 LIBS="-L$withval/lib $LIBS"]) 173 LIBS="-L$withval/lib $LIBS"])
201 174
202 AC_PATH_GENERIC(imlib2, , [ 175 AC_PATH_GENERIC(imlib2, ,
203 AC_SUBST(imlib2_libs) 176 AC_DEFINE(HAVE_IMLIB, 1, [Define to 1 if you have Imlib2]), [
204 AC_SUBST(imlib2_cflags)], 177 have_imlib2="no"
205 AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in path?)) 178 AC_MSG_WARN(Cannot find imlib2: Is imlib2-config in path?)
206 imlib2_libs=`imlib2-config --libs` 179 ])
207 imlib2_cflags=`imlib2-config --cflags`
208fi 180fi
209AC_SUBST(imlib2_cflags)
210AC_SUBST(imlib2_libs)
211 181
212AC_ARG_WITH(evas, 182AC_ARG_WITH(evas,
213 [ --with-evas=DIR use evas in <DIR>], 183 [ --with-evas=DIR use evas in <DIR>],
214 [CFLAGS="$CFLAGS -I$withval/include" 184 [CFLAGS="$CFLAGS -I$withval/include"
215 LIBS="-L$withval/lib $LIBS"]) 185 LIBS="-L$withval/lib $LIBS"])
216 186
217AC_PATH_GENERIC(evas, , [ 187AC_PATH_GENERIC(evas, , ,
218 AC_SUBST(evas_libs)
219 AC_SUBST(evas_cflags)],
220 AC_MSG_ERROR(Cannot find evas: Is evas-config in path?)) 188 AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
221 189
222if [ test -z "$EVAS_CONFIG" ]; then EVAS_CONFIG="evas-config"; fi
223evas_cflags=`$EVAS_CONFIG --cflags`
224evas_libs=`$EVAS_CONFIG --libs`
225
226AC_SUBST(evas_cflags)
227AC_SUBST(evas_libs)
228
229AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [ 190AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
230 #include <Evas.h> 191 #include <Evas.h>
231 ]) 192 ])
@@ -243,18 +204,9 @@ AC_ARG_WITH(ecore,
243 [CFLAGS="$CFLAGS -I$withval/include" 204 [CFLAGS="$CFLAGS -I$withval/include"
244 LIBS="-L$withval/lib $LIBS"]) 205 LIBS="-L$withval/lib $LIBS"])
245 206
246AC_PATH_GENERIC(ecore, , [ 207AC_PATH_GENERIC(ecore, , ,
247 AC_SUBST(ecore_libs)
248 AC_SUBST(ecore_cflags)],
249 AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?)) 208 AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
250 209
251if [ test -z "$ECORE_CONFIG" ]; then ECORE_CONFIG="ecore-config"; fi
252ecore_cflags=`$ECORE_CONFIG --cflags`
253ecore_libs=`$ECORE_CONFIG --libs`
254
255AC_SUBST(ecore_cflags)
256AC_SUBST(ecore_libs)
257
258AC_MSG_CHECKING([for location of Vim data files]) 210AC_MSG_CHECKING([for location of Vim data files])
259install_vim="yes"; 211install_vim="yes";
260AC_ARG_WITH(vim, 212AC_ARG_WITH(vim,
@@ -311,3 +263,11 @@ edje-config
311chmod +x edje-config 263chmod +x edje-config
312touch edje_docs.tar.gz 264touch edje_docs.tar.gz
313]) 265])
266
267if test "x$have_edje_cc" = "xyes"; then
268 if test "x$have_imlib2" = "xno"; then
269 echo
270 echo "WARNING: Building edje_cc without Imlib2 support!"
271 echo
272 fi
273fi
diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am
index cbe3032f35..37228863c6 100644
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@@ -4,10 +4,10 @@ INCLUDES = \
4-I$(top_srcdir) \ 4-I$(top_srcdir) \
5-I$(top_srcdir)/bin \ 5-I$(top_srcdir)/bin \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7@eet_cflags@ \ 7@EET_CFLAGS@ \
8@evas_cflags@ \ 8@EVAS_CFLAGS@ \
9@ecore_cflags@ \ 9@ECORE_CFLAGS@ \
10@imlib2_cflags@ 10@IMLIB2_CFLAGS@
11 11
12bin_SCRIPTS = \ 12bin_SCRIPTS = \
13edje_recc 13edje_recc
@@ -48,7 +48,7 @@ edje_cc_sources.c
48 48
49edje_cc_LDADD = \ 49edje_cc_LDADD = \
50$(top_builddir)/src/lib/libedje.la \ 50$(top_builddir)/src/lib/libedje.la \
51@imlib2_libs@ 51@IMLIB2_LIBS@
52 52
53edje_cc_CPPFLAGS = @edje_def@ 53edje_cc_CPPFLAGS = @edje_def@
54 54
@@ -65,7 +65,7 @@ edje_cc_sources.c
65 65
66edje_decc_LDADD = \ 66edje_decc_LDADD = \
67$(top_builddir)/src/lib/libedje.la \ 67$(top_builddir)/src/lib/libedje.la \
68@imlib2_libs@ 68@IMLIB2_LIBS@
69 69
70edje_decc_CPPFLAGS = @edje_def@ 70edje_decc_CPPFLAGS = @edje_def@
71 71
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index b3e82ad2f1..1ce04c46f4 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -236,6 +236,7 @@ data_write(void)
236 free(fdata); 236 free(fdata);
237 } 237 }
238 } 238 }
239#ifdef HAVE_IMLIB
239 if ((edje_file) && (edje_file->image_dir)) 240 if ((edje_file) && (edje_file->image_dir))
240 { 241 {
241 for (l = edje_file->image_dir->entries; l; l = l->next) 242 for (l = edje_file->image_dir->entries; l; l = l->next)
@@ -404,6 +405,7 @@ data_write(void)
404 } 405 }
405 } 406 }
406 } 407 }
408#endif
407 for (l = edje_collections; l; l = l->next) 409 for (l = edje_collections; l; l = l->next)
408 { 410 {
409 Edje_Part_Collection *pc; 411 Edje_Part_Collection *pc;
diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am
index 110e9b16ec..37c4d811f0 100644
--- a/legacy/edje/src/lib/Makefile.am
+++ b/legacy/edje/src/lib/Makefile.am
@@ -10,10 +10,10 @@ INCLUDES = \
10-I$(top_srcdir) \ 10-I$(top_srcdir) \
11-I$(top_builddir) \ 11-I$(top_builddir) \
12-I$(includedir) \ 12-I$(includedir) \
13@eet_cflags@ \ 13@EET_CFLAGS@ \
14@embryo_cflags@ \ 14@EMBRYO_CFLAGS@ \
15@evas_cflags@ \ 15@EVAS_CFLAGS@ \
16@ecore_cflags@ \ 16@ECORE_CFLAGS@ \
17@edje_def@ 17@edje_def@
18 18
19lib_LTLIBRARIES = \ 19lib_LTLIBRARIES = \
@@ -42,7 +42,7 @@ edje_container.h \
42edje_message_queue.c \ 42edje_message_queue.c \
43edje_private.h 43edje_private.h
44 44
45libedje_la_LIBADD = $(LDFLAGS) -lm @evas_libs@ @ecore_libs@ @eet_libs@ @embryo_libs@ @fnmatch_libs@ 45libedje_la_LIBADD = $(LDFLAGS) -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@
46libedje_la_CPPFLAGS = 46libedje_la_CPPFLAGS =
47libedje_la_DEPENDENCIES = $(top_builddir)/config.h 47libedje_la_DEPENDENCIES = $(top_builddir)/config.h
48libedje_la_LDFLAGS = -version-info 5:0:5 48libedje_la_LDFLAGS = -version-info 5:0:5
@@ -50,6 +50,6 @@ libedje_la_LDFLAGS = -version-info 5:0:5
50libedje_edit_la_SOURCES = \ 50libedje_edit_la_SOURCES = \
51edje_edit.c 51edje_edit.c
52 52
53libedje_edit_la_LIBADD = $(LDFLAGS) -lm @evas_libs@ @ecore_libs@ @eet_libs@ @embryo_libs@ $(top_builddir)/src/lib/libedje.la 53libedje_edit_la_LIBADD = $(LDFLAGS) -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ $(top_builddir)/src/lib/libedje.la
54libedje_edit_la_DEPENDENCIES = $(top_builddir)/config.h libedje.la 54libedje_edit_la_DEPENDENCIES = $(top_builddir)/config.h libedje.la
55libedje_edit_la_LDFLAGS = -version-info 5:0:5 55libedje_edit_la_LDFLAGS = -version-info 5:0:5