Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/efsd
Dir : e17/apps/efsd
Modified Files:
configure.ac configure.in
Log Message:
Inherited new detection for Fam (thanks evidence)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.ac 8 Aug 2005 03:37:26 -0000 1.6
+++ configure.ac 8 Aug 2005 12:44:47 -0000 1.7
@@ -38,25 +38,28 @@
AC_DEFINE(HAVE_STATFS, 1)
fi
-
dnl Check for fam.
+save_LIBS="$LIBS"
+save_CFLAGS="$CFLAGS"
AC_ARG_WITH(fam,
- [ --with-fam=DIR use DIR where fam is installed.],
- [CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS
-L$withval/lib"])
+ AC_HELP_STRING([--with-fam=DIR],[use DIR where fam is installed.]),
+ [fam_cflags="-I$withval/include"; fam_libs="-L$withval/lib -lfam";
+ CFLAGS="$CFLAGS -I$withval/include"; LIBS="$LIBS -L$withval/lib
-lfam"; ],
+ [fam_cflags=""; fam_libs="-lfam"])
AC_CHECK_HEADER(fam.h, , fam_header_ok="no")
AC_CHECK_LIB(fam, main, , fam_lib_ok="no")
-if test "$fam_header_ok" = "no" -o "$fam_lib_ok" = "no"; then cat <<EOF;
-
-------------------------------------------------------
-ERROR: Could not find a complete installation of FAM,
-the File Alteration Monitor, on your system.
+if test "$fam_header_ok" = "no" -o "$fam_lib_ok" = "no"; then
+ fam="without FAM (file-alteration monitor) support";
+ AC_MSG_WARN(Optional library FAM not found -- this is not a problem.)
+else
+ fam="with FAM (file-alteration monitor) support";
+ AC_DEFINE(HAVE_FAM, 1, try to use File-alteration monitor)
+fi;
+LIBS="$save_LIBS"
+CFLAGS="$save_CFLAGS"
+AC_SUBST(fam_cflags)
+AC_SUBST(fam_libs)
-You can download FAM at:
-http://oss.sgi.com/projects/fam
-------------------------------------------------------
-EOF
-AC_MSG_ERROR(FAM not found)
-fi
dnl Check for pthreads. Make sure we have both
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/efsd/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- configure.in 4 Aug 2005 05:30:22 -0000 1.25
+++ configure.in 8 Aug 2005 12:44:47 -0000 1.26
@@ -38,25 +38,28 @@
AC_DEFINE(HAVE_STATFS, 1)
fi
-
dnl Check for fam.
+save_LIBS="$LIBS"
+save_CFLAGS="$CFLAGS"
AC_ARG_WITH(fam,
- [ --with-fam=DIR use DIR where fam is installed.],
- [CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS
-L$withval/lib"])
+ AC_HELP_STRING([--with-fam=DIR],[use DIR where fam is installed.]),
+ [fam_cflags="-I$withval/include"; fam_libs="-L$withval/lib -lfam";
+ CFLAGS="$CFLAGS -I$withval/include"; LIBS="$LIBS -L$withval/lib
-lfam"; ],
+ [fam_cflags=""; fam_libs="-lfam"])
AC_CHECK_HEADER(fam.h, , fam_header_ok="no")
AC_CHECK_LIB(fam, main, , fam_lib_ok="no")
-if test "$fam_header_ok" = "no" -o "$fam_lib_ok" = "no"; then cat <<EOF;
-
-------------------------------------------------------
-ERROR: Could not find a complete installation of FAM,
-the File Alteration Monitor, on your system.
+if test "$fam_header_ok" = "no" -o "$fam_lib_ok" = "no"; then
+ fam="without FAM (file-alteration monitor) support";
+ AC_MSG_WARN(Optional library FAM not found -- this is not a problem.)
+else
+ fam="with FAM (file-alteration monitor) support";
+ AC_DEFINE(HAVE_FAM, 1, try to use File-alteration monitor)
+fi;
+LIBS="$save_LIBS"
+CFLAGS="$save_CFLAGS"
+AC_SUBST(fam_cflags)
+AC_SUBST(fam_libs)
-You can download FAM at:
-http://oss.sgi.com/projects/fam
-------------------------------------------------------
-EOF
-AC_MSG_ERROR(FAM not found)
-fi
dnl Check for pthreads. Make sure we have both
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
