Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv12309
Modified Files:
configure configure.in
Log Message:
fixed makeversion generation for BSD/Darwin sed
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.304
retrieving revision 1.305
diff -b -u -2 -r1.304 -r1.305
--- configure 19 Aug 2003 16:25:02 -0000 1.304
+++ configure 19 Aug 2003 20:23:55 -0000 1.305
@@ -1507,54 +1507,32 @@
-
- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1512: checking for strerror in -lcposix" >&5
-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lcposix $LIBS"
[...1279 lines suppressed...]
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5883,6 +5861,8 @@
esac
+ # be careful to use only standard BRE features: this is why we use
+ # \{1,\} instead of + for example
grep "^#define M_VERSION_[MR]" $src/include/Mversion.h | \
- sed 's/^#define \+\(\w\+\) \+\([0-9]\+\)/\1=\2/' > makeversion
+ sed 's/^#define \{1,\}\([A-Z_]\{1,\}\) \{1,\}\([0-9]\{1,\}\)/\1=\2/' >
makeversion
@@ -5897,6 +5877,5 @@
echo
-echo "Configured Mahogany " \
- "${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE} for ${host}."
+echo "Configured Mahogany ${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE}
for ${host}."
echo ""
echo " wxWindows version used: ${WX_VERSION}"
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.290
retrieving revision 1.291
diff -b -u -2 -r1.290 -r1.291
--- configure.in 19 Aug 2003 16:20:23 -0000 1.290
+++ configure.in 19 Aug 2003 20:23:55 -0000 1.291
@@ -1118,5 +1118,5 @@
echo "int main() { return 0; }" >conftest.c
if $CXX -o conftest $WX_LIBS conftest.c && \
- $(LDD) conftest | fgrep libwx >/dev/null
+ $LDD conftest | fgrep libwx >/dev/null
then
m_cv_USE_MODULES=dynamic
@@ -1377,6 +1377,8 @@
esac
+ # be careful to use only standard BRE features: this is why we use
+ # \{1,\} instead of + for example
grep "^#define M_VERSION_[MR]" $src/include/Mversion.h | \
- sed 's/^#define \+\(\w\+\) \+\([0-9]\+\)/\1=\2/' > makeversion
+ sed 's/^#define \{1,\}\([A-Z_]\{1,\}\) \{1,\}\([0-9]\{1,\}\)/\1=\2/' >
makeversion
],
src="$srcdir" SRC="$SOURCEDIR" OBJ="$BUILDDIR"
@@ -1390,6 +1392,5 @@
echo
-echo "Configured Mahogany " \
- "${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE} for ${host}."
+echo "Configured Mahogany ${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE}
for ${host}."
echo ""
echo " wxWindows version used: ${WX_VERSION}"
-------------------------------------------------------
This SF.net email is sponsored by Dice.com.
Did you know that Dice has over 25,000 tech jobs available today? From
careers in IT to Engineering to Tech Sales, Dice has tech jobs from the
best hiring companies. http://www.dice.com/index.epl?rel_code=104
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
