aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2009-10-03 07:05:03 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2009-10-03 07:05:03 (GMT)
commit8e8939821cee9d7c81bf5543ff39bbe734f8d2be (patch)
treed8ca98a575baa660d56389ce32c4c838477f8fe4
parent3b362ab816d0600995d9da98515b94e7cc26756c (diff)
downloadfluxbox-8e8939821cee9d7c81bf5543ff39bbe734f8d2be.zip
fluxbox-8e8939821cee9d7c81bf5543ff39bbe734f8d2be.tar.bz2
build system: moved some things around, 'finished configuring' message now at the end
-rw-r--r--configure.in122
1 files changed, 41 insertions, 81 deletions
diff --git a/configure.in b/configure.in
index 73662ae..8fa5a8e 100644
--- a/configure.in
+++ b/configure.in
@@ -18,6 +18,13 @@ AC_PROG_CXX
18AC_PROG_INSTALL 18AC_PROG_INSTALL
19AC_PROG_RANLIB 19AC_PROG_RANLIB
20 20
21AC_C_CONST
22AC_C_INLINE
23
24AC_TYPE_PID_T
25AC_TYPE_SIZE_T
26
27
21AC_CHECK_PROGS(regex_cmd, sed) 28AC_CHECK_PROGS(regex_cmd, sed)
22if test x$regex_cmd = "x"; then 29if test x$regex_cmd = "x"; then
23 AC_MSG_ERROR([error. sed is required to build the data files.]) 30 AC_MSG_ERROR([error. sed is required to build the data files.])
@@ -25,12 +32,15 @@ fi
25 32
26dnl Check for system header files 33dnl Check for system header files
27AC_HEADER_STDC 34AC_HEADER_STDC
35AC_HEADER_STDBOOL
28AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \ 36AC_CHECK_HEADERS(errno.h ctype.h dirent.h fcntl.h libgen.h \
29 locale.h nl_types.h process.h signal.h stdarg.h \ 37 locale.h nl_types.h process.h signal.h stdarg.h \
30 stdio.h time.h unistd.h \ 38 stdio.h time.h unistd.h \
31 sys/param.h sys/select.h sys/signal.h sys/stat.h \ 39 sys/param.h sys/select.h sys/signal.h sys/stat.h \
32 sys/time.h sys/types.h sys/wait.h \ 40 sys/time.h sys/types.h sys/wait.h \
33 iconv.h) 41 langinfo.h iconv.h)
42
43
34 44
35AC_CHECK_HEADERS(sstream, , 45AC_CHECK_HEADERS(sstream, ,
36 [ AC_CHECK_HEADERS(strstream,, 46 [ AC_CHECK_HEADERS(strstream,,
@@ -40,11 +50,21 @@ AC_CHECK_HEADERS(sstream, ,
40 50
41AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdio cstdlib cstring ctime) 51AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdio cstdlib cstring ctime)
42 52
43AC_HEADER_TIME
44 53
45dnl Check for existance of basename(), setlocale() and strftime() 54dnl Check for existance of basename(), setlocale() and strftime()
55AC_FUNC_CLOSEDIR_VOID
56AC_FUNC_ERROR_AT_LINE
57AC_FUNC_FORK
58AC_FUNC_MALLOC
59AC_FUNC_REALLOC
60AC_FUNC_SELECT_ARGTYPES
61AC_FUNC_STAT
62
46AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename, LIBS="$LIBS -lgen")) 63AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename, LIBS="$LIBS -lgen"))
47AC_CHECK_FUNCS(getpid setlocale sigaction strcasestr snprintf vsnprintf catopen catgets catclose) 64AC_CHECK_FUNCS(catclose catgets catopen getpid gettimeofday memset mkdir \
65 nl_langinfo putenv regcomp select setenv setlocale sigaction snprintf \
66 sqrt strcasecmp strcasestr strchr strstr strtol strtoul vsnprintf)
67
48dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?): 68dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?):
49dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc 69dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc
50dnl breaks with: 70dnl breaks with:
@@ -69,6 +89,8 @@ size_t x = strftime(s, 5, "%a", localtime(&t));
69[AC_MSG_RESULT(no)]) 89[AC_MSG_RESULT(no)])
70 90
71 91
92AC_STRUCT_TM
93
72dnl --------------- 94dnl ---------------
73dnl CHECK FOR ICONV 95dnl CHECK FOR ICONV
74dnl --------------- 96dnl ---------------
@@ -608,21 +630,6 @@ AC_TYPE_SIGNAL
608dnl Determine if maintainer portions of the Makefiles should be included. 630dnl Determine if maintainer portions of the Makefiles should be included.
609dnl AM_MAINTAINER_MODE 631dnl AM_MAINTAINER_MODE
610 632
611dnl Print results
612AC_MSG_RESULT([])
613AC_MSG_RESULT([ $PACKAGE version $VERSION configured successfully.])
614AC_MSG_RESULT([])
615AC_MSG_RESULT([Using '$prefix' for installation.])
616AC_MSG_RESULT([Using '$DEFAULT_MENU' for location menu file.])
617AC_MSG_RESULT([Using '$DEFAULT_STYLE' by default style.])
618AC_MSG_RESULT([Using '$DEFAULT_KEYS' for location keys file.])
619AC_MSG_RESULT([Using '$DEFAULT_INIT' for location init file.])
620AC_MSG_RESULT([Using '$LOCALE_PATH' for nls files.])
621AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
622AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
623AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
624AC_MSG_RESULT([])
625
626dnl Output files 633dnl Output files
627AM_CONFIG_HEADER(config.h) 634AM_CONFIG_HEADER(config.h)
628 635
@@ -693,66 +700,19 @@ nls/zh_CN/Makefile
693nls/zh_TW/Makefile 700nls/zh_TW/Makefile
694) 701)
695 702
696dnl autoscan suggested these as of 2cac7ddf6fb0b3c937c4ea7b55b20960e362a360 703dnl Print results
697dnl wanted by: src/ClockTool.cc:262 704AC_MSG_RESULT([])
698AC_CHECK_FUNCS([gettimeofday]) 705AC_MSG_RESULT([ $PACKAGE version $VERSION configured successfully.])
699dnl wanted by: src/Ewmh.cc:770 706AC_MSG_RESULT([])
700AC_CHECK_FUNCS([memset]) 707AC_MSG_RESULT([Using '$prefix' for installation.])
701dnl wanted by: src/fluxbox.cc:553 708AC_MSG_RESULT([Using '$DEFAULT_MENU' for location menu file.])
702AC_CHECK_FUNCS([mkdir]) 709AC_MSG_RESULT([Using '$DEFAULT_STYLE' by default style.])
703dnl wanted by: src/FbTk/FbString.cc:80 710AC_MSG_RESULT([Using '$DEFAULT_KEYS' for location keys file.])
704AC_CHECK_FUNCS([nl_langinfo]) 711AC_MSG_RESULT([Using '$DEFAULT_INIT' for location init file.])
705dnl wanted by: src/FbCommands.cc:172 712AC_MSG_RESULT([Using '$LOCALE_PATH' for nls files.])
706AC_CHECK_FUNCS([putenv]) 713AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
707dnl wanted by: src/FbTk/RegExp.cc:56 714AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
708AC_CHECK_FUNCS([regcomp]) 715AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
709dnl wanted by: src/FbTk/Timer.cc:156 716AC_MSG_RESULT([])
710AC_CHECK_FUNCS([select]) 717AC_MSG_RESULT([Now build $PACKAGE with 'make'])
711dnl wanted by: src/FbCommands.cc:206 718AC_MSG_RESULT([])
712AC_CHECK_FUNCS([setenv])
713dnl wanted by: src/WorkspaceCmd.cc:403
714AC_CHECK_FUNCS([sqrt])
715dnl wanted by: src/ClientPattern.cc:104
716AC_CHECK_FUNCS([strcasecmp])
717dnl wanted by: src/FbTk/XmbFontImp.cc:101
718AC_CHECK_FUNCS([strchr])
719dnl wanted by: src/RootTheme.cc:187
720AC_CHECK_FUNCS([strstr])
721dnl wanted by: src/Window.cc:4165
722AC_CHECK_FUNCS([strtol])
723dnl wanted by: src/Keys.cc:422
724AC_CHECK_FUNCS([strtoul])
725dnl wanted by: src/FbTk/FbString.cc:43
726AC_CHECK_HEADERS([langinfo.h])
727dnl wanted by: src/AlphaMenu.cc:51
728AC_C_CONST
729dnl wanted by: src/Window.cc:3259
730AC_C_INLINE
731dnl wanted by: src/FbTk/FileUtil.cc:117
732AC_FUNC_CLOSEDIR_VOID
733dnl wanted by: src/ClientPattern.cc:333
734AC_FUNC_ERROR_AT_LINE
735dnl wanted by: src/FbCommands.cc:144
736AC_FUNC_FORK
737dnl wanted by: src/FbTk/FbString.cc:150
738AC_FUNC_MALLOC
739dnl wanted by: src/FbTk/FbString.cc:181
740AC_FUNC_REALLOC
741dnl wanted by: src/FbTk/Timer.cc:156
742AC_FUNC_SELECT_ARGTYPES
743dnl wanted by: src/Slit.cc:1149
744AC_FUNC_STAT
745dnl wanted by: src/ClockTool.cc:273
746AC_FUNC_STRFTIME
747dnl wanted by: src/FbTk/FileUtil.hh:34
748AC_HEADER_DIRENT
749dnl wanted by: src/AlphaMenu.hh:49
750AC_HEADER_STDBOOL
751dnl wanted by: src/Keys.cc:75
752AC_HEADER_SYS_WAIT
753dnl wanted by: src/AlphaMenu.cc:37
754AC_STRUCT_TM
755dnl wanted by: src/FbCommands.cc:144
756AC_TYPE_PID_T
757dnl wanted by: src/ClientMenu.cc:128
758AC_TYPE_SIZE_T