Update of /cvs/fresco/Fresco/config
In directory purcel:/tmp/cvs-serv31201
Modified Files:
cave.m4 glut.m4 omniorb.m4 package.m4 pthread.m4 synopsis.m4
thread.m4 xslt.m4
Log Message:
* Consistently use AC_HELP_STRING
* Consistently use --*-prefix=PRF
* Use $host instead of $target
Index: cave.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/cave.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cave.m4 20 Jun 2001 03:40:00 -0000 1.3
+++ cave.m4 7 Jan 2004 14:38:28 -0000 1.4
@@ -27,8 +27,9 @@
AC_DEFUN([BERLIN_CAVELIB_CHECK],[
AC_ARG_WITH(cavelib-prefix,
- [ --with-cavelib-prefix=PFX Prefix for cavelib (console
CAVELib)],[
- cavelib_prefix="$withval"])
+ AC_HELP_STRING([--with-cavelib-prefix=PFX],
+ [Prefix for cavelib (console CAVELib)]) ,
+ [cavelib_prefix="$withval"])
dnl Check for cavelib includes
if test ".$cavelib_prefix" != . ; then
Index: glut.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/glut.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glut.m4 20 Jun 2001 03:40:00 -0000 1.2
+++ glut.m4 7 Jan 2004 14:38:28 -0000 1.3
@@ -26,8 +26,8 @@
AC_DEFUN([BERLIN_GLUT_CHECK],[
AC_ARG_WITH(glut-prefix,
- [ --with-glut-prefix=PFX Prefix for GLUT],[
- glut_prefix="$withval"])
+ AC_HELP_STRING([--with-glut-prefix=PFX], [Prefix for GLUT]),
+ [glut_prefix="$withval"])
dnl Check for GLUT includes
if test ".$glut_prefix" != . ; then
Index: omniorb.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/omniorb.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- omniorb.m4 28 Aug 2003 16:16:42 -0000 1.29
+++ omniorb.m4 7 Jan 2004 14:38:28 -0000 1.30
@@ -35,14 +35,16 @@
AC_REQUIRE([FRESCO_PTHREAD])
AC_ARG_WITH(omniorb-prefix,
- [ --with-omniorb-prefix Prefix for omniORB],
- [ omniorb_prefix="$withval"])
+ AC_HELP_STRING([--with-omniorb-prefix=PRF], [prefix for omniORB]),
+ [omniorb_prefix="$withval"])
AC_ARG_WITH(omniorb-version,
- [ --with-omniorb-version omniORB version (3 and 4 supported)],
- [ omniorb_version="$withval"])
+ AC_HELP_STRING([--with-omniorb-version=VRS],
+ [omniORB version (3 and 4 supported)]),
+ [omniorb_version="$withval"])
if test ".$omniorb_version" = ".4" ; then
AC_ARG_WITH(colocation-optimization,
- [ --with-colocation-optimization switch on ORB specific optimizations],
+ AC_HELP_STRING([--with-colocation-optimization],
+ [switch on ORB specific optimizations]),
[ omniorb_shortcut="$withval"])
SHORTCUT="$omniorb_shortcut"
AC_SUBST(SHORTCUT)
Index: package.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/package.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- package.m4 4 Dec 2002 03:15:53 -0000 1.16
+++ package.m4 7 Jan 2004 14:38:28 -0000 1.17
@@ -52,10 +52,10 @@
$2_BUILD_LIBS="`$$2_LOCAL_BUILD_CONFIG --libs`"
$2_prefix="`$$2_LOCAL_BUILD_CONFIG --prefix`"
else
- AC_ARG_WITH($2-prefix, AC_HELP_STRING([--with-$2-prefix],
+ AC_ARG_WITH($2-prefix, AC_HELP_STRING([--with-$2-prefix=PRF],
[Prefix where $1 is installed]),
$2_prefix="$withval", $2_prefix="")
- AC_ARG_WITH($2-exec-prefix, AC_HELP_STRING([--with-$2-exec-prefix],
+ AC_ARG_WITH($2-exec-prefix, AC_HELP_STRING([--with-$2-exec-prefix=PRF],
[Exec prefix where $1 is
installed]),
$2_exec_prefix="$withval", $2_exec_prefix="")
Index: pthread.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/pthread.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pthread.m4 25 Nov 2002 22:01:17 -0000 1.6
+++ pthread.m4 7 Jan 2004 14:38:28 -0000 1.7
@@ -26,8 +26,9 @@
AC_DEFUN([FRESCO_PTHREAD],[
dnl This is used on Linux for glibc binary compatibility (Doh!)
- AC_ARG_ENABLE(pthread-sem, [ --enable-pthread-sem use pthread
semaphores [default=yes]],, enable_pthread_sem=yes)
- case "$target" in
+ AC_ARG_ENABLE(pthread-sem, AC_HELP_STRING([--enable-pthread-sem],
+ [use pthread semaphores [default=yes]]), , enable_pthread_sem=yes)
+ case "$host" in
*-*-darwin*)
pthread_cppflags="-D_THREAD_SAFE"
# causes Carbon.p complaints?
Index: synopsis.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/synopsis.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- synopsis.m4 1 Feb 2001 14:48:48 -0000 1.1
+++ synopsis.m4 7 Jan 2004 14:38:28 -0000 1.2
@@ -27,7 +27,10 @@
AC_DEFUN([AC_SYNOPSIS],[
synopsis_path="$PATH"
- AC_ARG_WITH(synopsis-prefix, [ --with-synopsis-prefix Prefix for
synopsis],[ synopsis_prefix="$withval"])
+ AC_ARG_WITH(synopsis-prefix,
+ AC_HELP_STRING([--with-synopsis-prefix=PRF],
+ [Prefix for synopsis]),
+ [ synopsis_prefix="$withval"])
if test ".$synopsis_prefix" != "." ; then
synopsis_path="$synopsis_prefix:$synopsis_path"
fi
Index: thread.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/thread.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- thread.m4 25 Nov 2002 21:20:12 -0000 1.4
+++ thread.m4 7 Jan 2004 14:38:28 -0000 1.5
@@ -24,10 +24,11 @@
dnl Try to find a usable thread library.
dnl Add the necessary stuff to LIBS and CPPFLAGS
AC_DEFUN([FRESCO_THREAD],
- [AC_MSG_NOTICE([Threading])
+ [AC_MSG_CHECKING([for threading implementation])
AC_ARG_ENABLE(pthreads,
- [ --enable-pthreads use POSIX threads for multi-threading
(default: yes)],
- [ enable_pthreads="$enableval"])
+ AC_HELP_STRING([--enable-pthreads],
+ [use POSIX threads for multi-threading (default: yes)]),
+ [enable_pthreads="$enableval"])
if test ".$enable_pthreads" = . ; then
enable_pthreads=yes
fi
@@ -41,4 +42,4 @@
LIBS="$LIBS $pthread_lib"
fi
fi
-])
\ No newline at end of file
+])
Index: xslt.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/xslt.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xslt.m4 6 Jun 2001 21:01:47 -0000 1.1
+++ xslt.m4 7 Jan 2004 14:38:28 -0000 1.2
@@ -26,7 +26,10 @@
AC_DEFUN([AC_XSLT],[
xslt_path="$PATH"
- AC_ARG_WITH(xslt-prefix, [ --with-xslt-prefix Prefix for xslt
processor],[xslt_prefix="$withval"])
+ AC_ARG_WITH(xslt-prefix,
+ AC_HELP_STRING([--with-xslt-prefix=PRF],
+ [Prefix for xslt processor]),
+ [xslt_prefix="$withval"])
if test ".$xslt_prefix" != "." ; then
xslt_path="$xslt_prefix:$xslt_path"
fi
|
