some echos interpret \n's and some don't. Deal with accordingly.

* acglib.m4: some echos interpret \n's and some don't. Deal with
accordingly.

-Yosh

diff --git a/ChangeLog b/ChangeLog
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a6265a9fce3cc8f2d5d7b8b8d0d44c27342a53d3..ba2cee842627a78c97ed316498a158fd081f6663 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Jan  4 15:35:29 PST 1999 Manish Singh <yosh@gimp.org>
+
+       * acglib.m4: some echos interpret \n's and some don't. Deal with
+       accordingly.
+
 Mon Jan  4 20:58:50 1999  Tim Janik  <timj@gtk.org>
 
        * gscanner.c: eliminated extraneous "register" qualifiers in variable

diff --git a/acglib.m4 b/acglib.m4
index ff1dbc3822c50df9205abc7a74a5a2be95ba550a..5d3cd93dec01287c430eaeea3f17264eb2983156 100644 (file)
--- a/acglib.m4
+++ b/acglib.m4
@@ -84,6 +84,11 @@ dnl GLIB_SYSDEFS (INCLUDES, DEFS_LIST, OFILE [, PREFIX])
 AC_DEFUN(GLIB_SYSDEFS,
 [glib_sysdefso="translit($3, [-_a-zA-Z0-9 *], [-_a-zA-Z0-9])"
 glib_sysdef_msg=`echo $2 | sed 's/:[[^         ]]*//g'`
+if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
+  glib_nl='\\n'
+else
+  glib_nl='\n'
+fi
 AC_MSG_CHECKING(system definitions for $glib_sysdef_msg)
 cat >confrun.c <<_______EOF
 #include <stdio.h>
@@ -96,12 +101,12 @@ for glib_sysdef_input in $2 ; do
        glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([[^:]]*\):.*$/\1/'`
        glib_default=`echo $glib_sysdef_input | sed 's/^[[^:]]*:\(.*\)$/\1/'`
        echo "#ifdef $glib_sysdef" >>confrun.c
-       echo "  fprintf (f, \"#define GLIB_SYSDEF_%s %s%d\\n\", \"$glib_sysdef\", \"$4\", $glib_sysdef);" >>confrun.c
+       echo "  fprintf (f, \"#define GLIB_SYSDEF_%s %s%d${glib_nl}\", \"$glib_sysdef\", \"$4\", $glib_sysdef);" >>confrun.c
        echo "#else" >>confrun.c
        if test $glib_sysdef != $glib_default; then
-               echo "  fprintf (f, \"#define GLIB_SYSDEF_%s %s%d\\n\", \"$glib_sysdef\", \"$4\", $glib_default);" >>confrun.c
+               echo "  fprintf (f, \"#define GLIB_SYSDEF_%s %s%d${glib_nl}\", \"$glib_sysdef\", \"$4\", $glib_default);" >>confrun.c
        else
-               echo "  fprintf (f, \"#define GLIB_SYSDEF_%s\\n\", \"$glib_sysdef\");" >>confrun.c
+               echo "  fprintf (f, \"#define GLIB_SYSDEF_%s${glib_nl}\", \"$glib_sysdef\");" >>confrun.c
        fi
        echo "#endif" >>confrun.c
 done