From 6fd41e77a5ce0a5a1e8fe1a30968029170493dd1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 22 Mar 2010 16:36:51 +0100
Subject: [PATCH] Use default system file if none found for uname

---
 src/configure    | 26 ++++++++++++++++----------
 src/configure.ac | 21 +++++++++++----------
 src/mk/Default   |  8 ++++++++
 3 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 src/mk/Default

diff --git a/src/configure b/src/configure
index 7f3ef96c..9e5b7aac 100755
--- a/src/configure
+++ b/src/configure
@@ -1862,17 +1862,23 @@ ac_config_headers="$ac_config_headers common/autoconfig.h"
 
 
 
-sys=`uname`
-if test -f mk/$sys ; then
-    (cd mk; rm -f sysconf; ln -s $sys sysconf)
-else
-   cat <<EOF
-    No system configuration file found in mk/ for '$sys'. Maybe you
-    could try to write one, starting from one of the existing files, they
-    are really simple.
-EOF
-   exit 1
+sys=`uname | tr / _`
+
+if test ! -f mk/$sys ; then
+   { $as_echo "$as_me:$LINENO:
+    No system configuration file found in mk/ for uname = '$sys'.
+    Trying with Default file.
+    If the build fails, you'll need to write a configuration file, starting
+    from one of the existing ones." >&5
+$as_echo "$as_me:
+    No system configuration file found in mk/ for uname = '$sys'.
+    Trying with Default file.
+    If the build fails, you'll need to write a configuration file, starting
+    from one of the existing ones." >&6;}
+
+    sys=Default
 fi
+(cd mk; rm -f sysconf; ln -s $sys sysconf)
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
diff --git a/src/configure.ac b/src/configure.ac
index b8110480..047b0210 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3,17 +3,18 @@ AC_CONFIG_HEADERS([common/autoconfig.h])
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(index/recollindex.cpp)
 
-sys=`uname`
-if test -f mk/$sys ; then
-    (cd mk; rm -f sysconf; ln -s $sys sysconf)
-else
-   cat <<EOF
-    No system configuration file found in mk/ for '$sys'. Maybe you
-    could try to write one, starting from one of the existing files, they
-    are really simple.
-EOF
-   exit 1
+sys=`uname | tr / _`
+
+if test ! -f mk/$sys ; then
+   AC_MSG_NOTICE([
+    No system configuration file found in mk/ for uname = '$sys'. 
+    Trying with Default file. 
+    If the build fails, you'll need to write a configuration file, starting 
+    from one of the existing ones.])
+
+    sys=Default   
 fi
+(cd mk; rm -f sysconf; ln -s $sys sysconf)
 
 AC_CHECK_HEADERS(sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h)
 
diff --git a/src/mk/Default b/src/mk/Default
new file mode 100644
index 00000000..aa9a9774
--- /dev/null
+++ b/src/mk/Default
@@ -0,0 +1,8 @@
+
+include $(depth)/mk/commondefs
+include $(depth)/mk/localdefs
+
+ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
+	 -D_GNU_SOURCE 
+
+LIBSYS = -lpthread -ldl