From 194167da32e27e1c0dd6524a537bcfd8944a94c2 Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Tue, 10 Oct 2006 07:24:40 +1000
Subject: [PATCH] New version of the xdg fix. Unlike the previous version, this
 one should actually work.

darcs-hash:20061009212440-ac50b-10d1cdd7441335d033171f5b71a8a97f8a1d1dfb.gz
---
 Makefile.in  | 4 ++--
 configure.ac | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 316202d01..099a0fef3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,9 +49,9 @@ prefix = @prefix@
 optbindirs = @optbindirs@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
-MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DHAVE_CONFIG_H
+MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" 
 CFLAGS=@CFLAGS@ $(MACROS) 
-CPPFLAGS=@CPPFLAGS@ -I.
+CPPFLAGS=@CPPFLAGS@ 
 LDFLAGS= @LIBS@ @LDFLAGS@ 
 
 
diff --git a/configure.ac b/configure.ac
index ba21a90d7..6af096a04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,8 +225,7 @@ if test "$glibc" = yes; then
 	# fallback.h, in order to keep fish working on non-gnu platforms.
 	#
 
-	AC_DEFINE( _GNU_SOURCE, 1, [Macro to enable additional prototypes under Glibc])
-	AC_DEFINE( _ISOC99_SOURCE, 1, [Macro to enable additional prototypes under Glibc])
+	CFLAGS="$CFLAGS -D_GNU_SOURCE=1 -D_ISO99_SOURCE=1"
 else
 	AC_MSG_RESULT(no)
 fi
@@ -291,9 +290,9 @@ fi
 AC_ARG_VAR( [docdir], [Documentation direcotry] )
 
 if test -z $docdir; then
-   AC_SUBST(docdir, [$datadir/doc/fish] )
+	AC_SUBST(docdir, [$datadir/doc/fish] )
 else
-   AC_SUBST(docdir, [$docdir])
+	AC_SUBST(docdir, [$docdir])
 fi
 
 # Set up locale directory. This is where the .po files will be