Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/exorcist/build
Modified Files:
configure config_check.inc
Log Message:
fix config checks for mac os x. Thanks, Nathan
===================================================================
RCS file: /cvs/e/e17/proto/exorcist/build/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- configure 2 Apr 2006 20:17:08 -0000 1.2
+++ configure 26 Apr 2006 18:28:22 -0000 1.3
@@ -185,7 +185,7 @@
# Epdf check
echo -n "Checking for Epdf library... "
have_epdf="no"
-epdf_check $epdf_config $have_ewl $have_etk && have_epdf="yes"
+epdf_check $epdf_config $have_ewl $ewl_config $have_etk $etk_config &&
have_epdf="yes"
echo "$have_epdf"
if test "x$have_epdf" = "xno" ; then
error_library_msg epdf
===================================================================
RCS file: /cvs/e/e17/proto/exorcist/build/config_check.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config_check.inc 17 Apr 2006 18:09:09 -0000 1.2
+++ config_check.inc 26 Apr 2006 18:28:22 -0000 1.3
@@ -36,7 +36,7 @@
#include "ewl_pdf.h"
EOF
fi
- if test "x$3" = "xyes" ; then
+ if test "x$4" = "xyes" ; then
cat >> conftest.c << EOF
#include <Etk.h>
#include "etk_pdf.h"
@@ -50,7 +50,7 @@
Ewl_Widget *ewl_pdf;
EOF
fi
- if test "x$3" = "xyes" ; then
+ if test "x$4" = "xyes" ; then
cat >> conftest.c << EOF
Etk_Widget *etk_pdf;
EOF
@@ -63,7 +63,7 @@
ewl_pdf = ewl_pdf_new ();
EOF
fi
- if test "x$3" = "xyes" ; then
+ if test "x$4" = "xyes" ; then
cat >> conftest.c << EOF
etk_pdf = etk_pdf_new ();
EOF
@@ -72,7 +72,16 @@
return 0;
}
EOF
- $CC $CPPFLAGS $CFLAGS `$1 --cflags --libs` conftest.c -o conftest
2>$DEVNULL
+ EPDF_FLAGS=`$1 --cflags --libs`
+ EWL_FLAGS=""
+ if test "x$2" = "xyes" ; then
+ EWL_FLAGS=`$3 --cflags --libs`
+ fi
+ ETK_FLAGS=""
+ if test "x$4" = "xyes" ; then
+ ETK_FLAGS=`$5 --cflags --libs`
+ fi
+ $CC $CPPFLAGS $CFLAGS $EPDF_FLAGS $EWL_FLAGS $ETK_FLAGS conftest.c -o
conftest 2>$DEVNULL
TMP="$?"
rm -f conftest.c conftest
return $TMP
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
