Date: Friday, April 6, 2007 @ 15:01:30
Author: marc
Path: /cvsroot/carob/libmysequoia
Added: main.config.site (1.1) os-configs/FreeBSD.config.site (1.1)
Removed: configure.withdefaults.sh (1.1)
Replaced ugly configure.withdefaults.sh by a standard a much more flexible
main.config.site
--------------------------------+
configure.withdefaults.sh | 13 -------------
main.config.site | 21 +++++++++++++++++++++
os-configs/FreeBSD.config.site | 5 +++++
3 files changed, 26 insertions(+), 13 deletions(-)
Index: libmysequoia/configure.withdefaults.sh
diff -u libmysequoia/configure.withdefaults.sh:1.1
libmysequoia/configure.withdefaults.sh:removed
--- libmysequoia/configure.withdefaults.sh:1.1 Fri Mar 23 19:32:00 2007
+++ libmysequoia/configure.withdefaults.sh Fri Apr 6 15:01:30 2007
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Hard-coding those values is either impossible, or hard, or forbidden
-# by GNU standards, or non-portable to some platforms far away in the
-# galaxy -- MH.
-
-test $# = 0 || { printf "This is just calling ./configure with interesting
defaults\n"; exit 0; }
-
-DOTDOTCAROB="`pwd`/../carob"
-
-set -x
-./configure --sysconfdir=/etc/mysequoia CPPFLAGS="-I$DOTDOTCAROB
-I/usr/local/include" LDFLAGS="-L$DOTDOTCAROB -L/usr/local/lib"
-
Index: libmysequoia/main.config.site
diff -u /dev/null libmysequoia/main.config.site:1.1
--- /dev/null Fri Apr 6 15:01:30 2007
+++ libmysequoia/main.config.site Fri Apr 6 15:01:30 2007
@@ -0,0 +1,21 @@
+
+
+# Default config dir (use --sysconfdir to override)
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc/mysequoia
+
+
+# Default carob location
+: ${CAROBDIR:="`pwd`/../carob"}
+
+
+CPPFLAGS="${CPPFLAGS} -I${CAROBDIR}"
+LDFLAGS="${LDFLAGS} -L${CAROBDIR}"
+
+
+# TODO: check different linux distributions, etc.
+UNAME=`uname -s`
+case ${UNAME} in
+ FreeBSD)
+ . ./os-configs/${UNAME}.config.site
+ ;;
+esac
Index: libmysequoia/os-configs/FreeBSD.config.site
diff -u /dev/null libmysequoia/os-configs/FreeBSD.config.site:1.1
--- /dev/null Fri Apr 6 15:01:30 2007
+++ libmysequoia/os-configs/FreeBSD.config.site Fri Apr 6 15:01:30 2007
@@ -0,0 +1,5 @@
+
+CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+
+LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
