Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
Tag: SPLIT
configure.in ecore-config.in
Log Message:
Only link in build options that were selected at compile time when linking
against this lib.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.8.2.12
retrieving revision 1.8.2.13
diff -u -3 -r1.8.2.12 -r1.8.2.13
--- configure.in 26 Apr 2003 03:39:13 -0000 1.8.2.12
+++ configure.in 22 Jun 2003 22:03:58 -0000 1.8.2.13
@@ -91,6 +91,9 @@
AC_MSG_CHECKING(whether ecore_x module is to be built)
+ecore_x_cflags="";
+ecore_x_libs="";
+
x_dir="";
x_includes="";
x_cflags="";
@@ -107,6 +110,7 @@
x_cflags="-I"$x_dir"/include"
x_libs="-L"$x_dir"/lib -lX11 -lXext"
x_ldflags="";
+ ecore_x_libs="-lecore_x";
], [
AC_MSG_RESULT(no)
AM_CONDITIONAL(BUILD_ECORE_X, false)
@@ -118,19 +122,32 @@
AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
+AC_SUBST(ecore_x_cflags)
+AC_SUBST(ecore_x_libs)
+
AC_MSG_CHECKING(whether ecore_job module is to be built)
+ecore_job_cflags="";
+ecore_job_libs="";
+
AC_ARG_ENABLE(ecore-job,
[ --enable-ecore-job enable the ecore_job module], [
AC_MSG_RESULT(yes)
AM_CONDITIONAL(BUILD_ECORE_JOB, test "$enableval" = "yes")
AC_DEFINE(BUILD_ECORE_JOB)
+ ecore_job_libs="-lecore_job";
], [
AC_MSG_RESULT(no)
AM_CONDITIONAL(BUILD_ECORE_JOB, false)
]
)
+AC_SUBST(ecore_job_cflags)
+AC_SUBST(ecore_job_libs)
+
+ecore_fb_cflags="";
+ecore_fb_libs="";
+
AC_MSG_CHECKING(whether ecore_fb module is to be built)
AC_ARG_ENABLE(ecore-fb,
@@ -138,12 +155,19 @@
AC_MSG_RESULT(yes)
AM_CONDITIONAL(BUILD_ECORE_FB, test "$enableval" = "yes")
AC_DEFINE(BUILD_ECORE_FB)
+ ecore_fb_libs="-lecore_fb";
], [
AC_MSG_RESULT(no)
AM_CONDITIONAL(BUILD_ECORE_FB, false)
]
)
+AC_SUBST(ecore_fb_cflags)
+AC_SUBST(ecore_fb_libs)
+
+ecore_evas_cflags="";
+ecore_evas_libs="";
+
evas_cflags="";
evas_libs="";
@@ -173,6 +197,7 @@
fi
evas_cflags=`$EVAS_CONFIG --cflags`
evas_libs=`$EVAS_CONFIG --libs`
+ ecore_evas_libs="-lecore_evas";
], [
AC_MSG_RESULT(no)
AM_CONDITIONAL(BUILD_ECORE_EVAS, false)
@@ -182,31 +207,48 @@
AC_SUBST(evas_cflags)
AC_SUBST(evas_libs)
+AC_SUBST(ecore_evas_cflags)
+AC_SUBST(ecore_evas_libs)
+
AC_MSG_CHECKING(whether ecore_con module is to be built)
+ecore_con_cflags="";
+ecore_con_libs="";
+
AC_ARG_ENABLE(ecore-con,
[ --enable-ecore-con enable the ecore_con module], [
AC_MSG_RESULT(yes)
AM_CONDITIONAL(BUILD_ECORE_CON, test "$enableval" = "yes")
AC_DEFINE(BUILD_ECORE_CON)
+ ecore_con_libs="-lecore_con"
], [
AC_MSG_RESULT(no)
AM_CONDITIONAL(BUILD_ECORE_CON, false)
]
)
+AC_SUBST(ecore_con_cflags)
+AC_SUBST(ecore_con_libs)
+
AC_MSG_CHECKING(whether ecore_ipc module is to be built)
+ecore_ipc_cflags="";
+ecore_ipc_libs="";
+
AC_ARG_ENABLE(ecore-ipc,
[ --enable-ecore-ipc enable the ecore_ipc module], [
AC_MSG_RESULT(yes)
AM_CONDITIONAL(BUILD_ECORE_IPC, test "$enableval" = "yes")
AC_DEFINE(BUILD_ECORE_IPC)
+ ecore_ipc_libs="-lecore_ipc"
], [
AC_MSG_RESULT(no)
AM_CONDITIONAL(BUILD_ECORE_IPC, false)
]
)
+
+AC_SUBST(ecore_ipc_cflags)
+AC_SUBST(ecore_ipc_libs)
AC_OUTPUT([
Makefile
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/ecore-config.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- ecore-config.in 22 Jun 2003 19:05:31 -0000 1.1.2.4
+++ ecore-config.in 22 Jun 2003 22:03:58 -0000 1.1.2.5
@@ -4,8 +4,6 @@
[EMAIL PROTECTED]@
exec_prefix_set=no
[EMAIL PROTECTED]@ecore_fb_libs=-lecore_fb
-
usage="\
Usage: ecore-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs]
[--cflags]"
@@ -48,7 +46,7 @@
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -lecore -lecore_job -lecore_x -lecore_evas -lecore_con
-lecore_ipc $ecore_fb_libs -lm
+ echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@
@ecore_con_libs@ @ecore_ipc_libs@ @ecore_fb_libs@ -lm
;;
*)
echo "${usage}" 1>&2
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
