Date: Tuesday, March 6, 2007 @ 20:05:13
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.28 -> 1.29)
Added support to compile against ../carob
--------------+
configure.ac | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.28 libmysequoia/configure.ac:1.29
--- libmysequoia/configure.ac:1.28 Tue Mar 6 19:54:00 2007
+++ libmysequoia/configure.ac Tue Mar 6 20:05:13 2007
@@ -116,7 +116,11 @@
else
AC_MSG_ERROR([You need to install the Carob development package or use
--with-carob-headers=DIR if the headers are in an unusual place.])
fi
-CAROB_CFLAGS="-I$carob_header_dir"
+# absolute or relative path?
+if test "${carob_header_dir#/}" == "${carob_header_dir}"
+then CAROB_CFLAGS="-I../$carob_header_dir"
+else CAROB_CFLAGS="-I$carob_header_dir"
+fi
AC_MSG_RESULT([$carob_header_dir])
AC_SUBST(CAROB_CFLAGS)
@@ -140,7 +144,11 @@
,AC_MSG_ERROR([You need to install the Carob development
packages or use --with-carob-lib=DIR if the library is in an unusual place.]))
CXXFLAGS="$save_CXXFLAGS"
LIBS="$save_LIBS"
-CAROB_LDADD="-L$carob_lib_dir -lcarob"
+# absolute or relative path?
+if test "${carob_lib_dir#/}" == "${carob_lib_dir}"
+then CAROB_LDADD="-L../$carob_lib_dir -lcarob"
+else CAROB_LDADD="-L$carob_lib_dir -lcarob"
+fi
AC_SUBST(CAROB_LDADD)
AC_MSG_RESULT([yes])
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
