aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome.m45
2 files changed, 9 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index d2e57f7673..3e899bc3f0 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 19 23:23:30 1998 Tom Tromey <tromey@cygnus.com>
+
+ * gnome.m4: An empty true branch of an `if' statement is not valid
+ sh syntax. If GNOME_INIT_HOOK argument $1 is empty, use ":"
+ instead.
+
1998-03-19 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gnome.m4 (GNOME_INIT_HOOK): Provide a way to hook some code to
diff --git a/macros/gnome.m4 b/macros/gnome.m4
index 283745c111..aa6165fad4 100644
--- a/macros/gnome.m4
+++ b/macros/gnome.m4
@@ -37,7 +37,8 @@ AC_DEFUN([GNOME_INIT_HOOK],
AC_ARG_WITH(gnome,
[ --with-gnome Specify prefix for GNOME files],[
if test x$withval = xyes; then
- $1
+ dnl Note that an empty true branch is not valid sh syntax.
+ ifelse([$1], [], :, [$1])
else
LDFLAGS="$LDFLAGS -L$withval/lib"
CFLAGS="$CFLAGS -I$withval/include"
@@ -61,4 +62,4 @@ AC_DEFUN([GNOME_INIT_HOOK],
AC_DEFUN([GNOME_INIT],[
GNOME_INIT_HOOK([],fail)
-]) \ No newline at end of file
+])
n title='2011-07-03 22:59:23 +0800'>2011-07-031-1/+0 * - Bump portrevisions on all ocaml libraries, as it appears that compiledstas2011-04-061-0/+1 * Update my mail address to @FreeBSD.orgjohans2010-02-241-1/+1 * Update to version 1.1johans2008-04-252-4/+4 * - Update to 1.0 release; fixes build with new ocamljohans2008-04-073-25/+10 * - Welcome X.org 7.2 \o/.flz2007-05-201-0/+1 * Reset marwan.burelle@lri.fr due to 6 months of inactivity, no response tolinimon2006-06-151-1/+1 * Update to 0.9miwi2006-06-142-4/+4 * Update port: devel/ocaml-ulex (upgrade to the latest version)edwin2006-01-033-14/+4 * - Fix build with ocaml 3.09garga2005-12-064-2/+12 * Re-add USE_GMAKE.thierry2005-06-101-0/+3 * - Update to 0.7;thierry2005-06-092-5/+6 * - Fix permission of ld.conf. It should be 0644 instead of 0444.sem2005-05-221-2/+0 * BROKEN: Changes permission of installed usr/local/lib/ocaml/ld.conf filekris2005-05-221-0/+2 * - Upgrade to 0.5 and chase OCaml;thierry2004-08-092-4/+5