tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move few things from the mk/sys files to autoconf

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/autoconfig.h.in
View File

@ -26,3 +26,6 @@
/* putenv parameter is const */ /* putenv parameter is const */
#undef PUTENV_ARG_CONST #undef PUTENV_ARG_CONST
/* mkdtemp availability */
#undef HAVE_MKDTEMP

5364
src/configure vendored
View File

File diff suppressed because it is too large Load Diff

4
src/configure.ac
View File

@ -110,6 +110,8 @@ else
AC_MSG_NOTICE([inotify monitoring disabled]) AC_MSG_NOTICE([inotify monitoring disabled])
fi fi
AC_CHECK_FUNCS(mkdtemp)
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib ##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
## then in libc (Linux, solaris) ## then in libc (Linux, solaris)
AC_LANG(C++) AC_LANG(C++)
@ -306,7 +308,7 @@ AC_SUBST(QMAKE)
AC_SUBST(QTGUI) AC_SUBST(QTGUI)
AC_SUBST(QTRECOLL_DATADIR) AC_SUBST(QTRECOLL_DATADIR)
AC_SUBST(XAPIANCXXFLAGS) AC_SUBST(XAPIANCXXFLAGS)
AC_SUBST(HAVE_MKDTEMP)
AC_CONFIG_FILES(mk/localdefs) AC_CONFIG_FILES(mk/localdefs)
AC_CONFIG_FILES(recollinstall) AC_CONFIG_FILES(recollinstall)
AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(Makefile)

2
src/mk/Darwin
View File

@ -2,8 +2,6 @@ include $(depth)/mk/commondefs
include $(depth)/mk/localdefs include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \ ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1 \
-DSTATFS_INCLUDE="<sys/mount.h>" -DSTATFS_INCLUDE="<sys/mount.h>"
RANLIB = ranlib RANLIB = ranlib

2
src/mk/FreeBSD
View File

@ -3,7 +3,5 @@ include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \ ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-pthread \ -pthread \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1 \
-DSTATFS_INCLUDE="<sys/mount.h>" -DSTATFS_INCLUDE="<sys/mount.h>"
LIBSYS = LIBSYS =

4
src/mk/Linux
View File

@ -3,8 +3,6 @@ include $(depth)/mk/commondefs
include $(depth)/mk/localdefs include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \ ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-D_GNU_SOURCE \ -D_GNU_SOURCE
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1
LIBSYS = -lpthread -ldl LIBSYS = -lpthread -ldl

2
src/mk/OpenBSD
View File

@ -3,7 +3,5 @@ include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \ ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
-pthread -I/usr/include \ -pthread -I/usr/include \
-DHAVE_VASPRINTF=1 \
-DHAVE_MKDTEMP=1 \
-DSTATFS_INCLUDE="<sys/mount.h>" -DSTATFS_INCLUDE="<sys/mount.h>"
LIBSYS = LIBSYS =