move few things from the mk/sys files to autoconf

This commit is contained in:
dockes
2008-06-13 18:14:41 +00:00
parent 0ca8e7c1f5
commit e5e8249ad3
7 changed files with 3253 additions and 2128 deletions
+3
View File
@@ -26,3 +26,6 @@
/* putenv parameter is const */
#undef PUTENV_ARG_CONST
/* mkdtemp availability */
#undef HAVE_MKDTEMP
+3246 -2118
View File
File diff suppressed because it is too large Load Diff
+3 -1
View File
@@ -110,6 +110,8 @@ else
AC_MSG_NOTICE([inotify monitoring disabled])
fi
AC_CHECK_FUNCS(mkdtemp)
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
## then in libc (Linux, solaris)
AC_LANG(C++)
@@ -306,7 +308,7 @@ AC_SUBST(QMAKE)
AC_SUBST(QTGUI)
AC_SUBST(QTRECOLL_DATADIR)
AC_SUBST(XAPIANCXXFLAGS)
AC_SUBST(HAVE_MKDTEMP)
AC_CONFIG_FILES(mk/localdefs)
AC_CONFIG_FILES(recollinstall)
AC_CONFIG_FILES(Makefile)
-2
View File
@@ -2,8 +2,6 @@ include $(depth)/mk/commondefs
include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1 \
-DSTATFS_INCLUDE="<sys/mount.h>"
RANLIB = ranlib
-2
View File
@@ -3,7 +3,5 @@ include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-pthread \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1 \
-DSTATFS_INCLUDE="<sys/mount.h>"
LIBSYS =
+1 -3
View File
@@ -3,8 +3,6 @@ include $(depth)/mk/commondefs
include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-D_GNU_SOURCE \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1
-D_GNU_SOURCE
LIBSYS = -lpthread -ldl
-2
View File
@@ -3,7 +3,5 @@ include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-pthread -I/usr/include \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1 \
-DSTATFS_INCLUDE="<sys/mount.h>"
LIBSYS =