Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in
Log Message:
Use cflags specified by *-config programs during configure process.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- configure.in 26 May 2005 13:33:06 -0000 1.50
+++ configure.in 8 Jul 2005 19:57:30 -0000 1.51
@@ -86,7 +86,10 @@
echo "alternatively, specify the script to use with --with-edb-config."
AC_MSG_ERROR([Fatal Error: no edb-config detected.])
fi
-])
+])
+
+edb_cflags=`$EDB_CONFIG --cflags`
+edb_libs=`$EDB_CONFIG --libs`
EVAS_CONFIG="evas-config"
AC_ARG_WITH(evas-config,
@@ -121,6 +124,11 @@
fi
])
+evas_cflags=`$EVAS_CONFIG --cflags`
+evas_libs=`$EVAS_CONFIG --libs`
+
+PCFLAGS=$CFLAGS
+CFLAGS=$evas_cflags" "$CFLAGS
AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
#include <Evas.h>
])
@@ -166,6 +174,10 @@
fi
])
+ecore_cflags=`$ECORE_CONFIG --cflags`
+ecore_libs=`$ECORE_CONFIG --libs`
+
+CFLAGS=$ecore_cflags" "$CFLAGS
EDJE_CONFIG="edje-config"
AC_ARG_WITH(edje-config,
[ --with-edje-config=FILE edje-config script to use (eg
/usr/bin/edje-config)],
@@ -199,6 +211,10 @@
fi
])
+edje_cflags=`$EDJE_CONFIG --cflags`
+edje_libs=`$EDJE_CONFIG --libs`
+
+CFLAGS=$edje_cflags" "$CFLAGS
EMOTION_CONFIG="emotion-config"
AC_ARG_WITH(emotion-config,
[ --with-emotion-config=FILE emotion-config script to use (eg
/usr/bin/emotion-config)],
@@ -216,31 +232,9 @@
fi
])
-AC_SUBST(edb_cflags)
-AC_SUBST(edb_libs)
-edb_cflags=`$EDB_CONFIG --cflags`
-edb_libs=`$EDB_CONFIG --libs`
-
-AC_SUBST(evas_cflags)
-AC_SUBST(evas_libs)
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
-
-AC_SUBST(ecore_cflags)
-AC_SUBST(ecore_libs)
-ecore_cflags=`$ECORE_CONFIG --cflags`
-ecore_libs=`$ECORE_CONFIG --libs`
-
-AC_SUBST(edje_cflags)
-AC_SUBST(edje_libs)
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-
requirements="evas ecore edb edje"
-AC_SUBST(emotion_cflags)
-AC_SUBST(emotion_libs)
-AC_SUBST(ewl_media_include)
+CFLAGS=$emotion_cflags" "$CFLAGS
if test "x$EMOTION_CONFIG_IN_PATH" = "xyes"; then
AC_CHECK_HEADERS(Emotion.h, [
SUPPORT_EMOTION=1
@@ -258,6 +252,24 @@
AC_SUBST(BUILD_EMOTION_SUPPORT_TRUE)
AC_SUBST(BUILD_EMOTION_SUPPORT_FALSE)
+CFLAGS=$PCFLAGS
+
+AC_SUBST(edb_cflags)
+AC_SUBST(edb_libs)
+
+AC_SUBST(evas_cflags)
+AC_SUBST(evas_libs)
+
+AC_SUBST(ecore_cflags)
+AC_SUBST(ecore_libs)
+
+AC_SUBST(edje_cflags)
+AC_SUBST(edje_libs)
+
+AC_SUBST(emotion_cflags)
+AC_SUBST(emotion_libs)
+AC_SUBST(ewl_media_include)
+
AC_SUBST(requirements)
AC_OUTPUT([
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
