[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox
From:       Luciano Montanaro <mikelima () cirulla ! net>
Date:       2005-03-07 13:24:12
Message-ID: 20050307132412.628E718607 () office ! kde ! org
[Download RAW message or body]

CVS commit by montanaro: 

Oops! I forgot this file last time! Fixed configure for kdelibs 3.4


  M +24 -9     configure.in.in   1.56


--- kdenox/configure.in.in  #1.55:1.56
@@ -23,4 +23,5 @@
 dnl Checks for programs.
 AC_CHECK_COMPILERS
+KDE_ENABLE_HIDDEN_VISIBILITY
 dnl AC_REQUIRE([AC_PROG_CPP])
 AC_ENABLE_SHARED(yes)
@@ -62,9 +63,10 @@
 
 dnl Checks for header files.
+KDE_CHECK_STL
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(sys/time.h sys/param.h \
         sys/select.h sys/ioctl.h sys/stropts.h stropts.h \
-        sys/sockio.h paths.h malloc.h limits.h strings.h string.h sys/stat.h )
+        sys/socket.h sys/sockio.h paths.h malloc.h limits.h strings.h string.h sys/stat.h )
 
 # XXX compiling the needed tools would be great, but it is quite a difficult
@@ -93,19 +95,27 @@
 AC_CHECK_SIZEOF(int,4)
 AC_CHECK_SIZEOF(long,4)
+AC_LANG_SAVE
+AC_LANG_C
+dnl AC_C_BIGENDIAN has a bug (one of its tests uses "main()" instead of
+dnl "int main()") so C++ compilers would break. Thats why we switch languages
 AC_C_BIGENDIAN
+AC_LANG_RESTORE
 
 dnl check if the compiler has bool
 AC_CHECK_BOOL
 
-dnl Checks for library functions. 
-AC_CHECK_FUNCS(socket snprintf vsnprintf)
-AC_CHECK_GETDOMAINNAME
-AC_CHECK_GETHOSTNAME
-AC_CHECK_USLEEP
+dnl Checks for library functions.
 AC_CHECK_SETENV
 AC_CHECK_UNSETENV
 AC_CHECK_RANDOM
 AC_CHECK_MKSTEMPS
+AC_CHECK_MKSTEMP
+AC_CHECK_MKDTEMP
+AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday snprintf vsnprintf)
+AC_CHECK_USLEEP
+AC_CHECK_GETHOSTNAME
+AC_CHECK_RANDOM
 AC_CHECK_S_ISSOCK
+AC_CHECK_GETDOMAINNAME
 AC_CHECK_KDEMAXPATHLEN
 AC_CHECK_SOCKLEN_T
@@ -119,8 +129,13 @@
 AC_DEFINE_UNQUOTED(KDESYSCONFDIR, "$ac_kde_sysconfdir", [The compiled in system configuration prefix])
 
-dnl CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST"
-CXXFLAGS="$CXXFLAGS -DQT_NO_ASCII_CAST"
+CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST"
+dnl CXXFLAGS="$CXXFLAGS -DQT_NO_ASCII_CAST"
+
+dnl output files
+AC_SUBST(x_includes)
+AC_SUBST(x_libraries)
+AC_SUBST(LIBSOCKET)
 
-KDE_CHECK_BINUTILS
 
 KDE_INIT_DOXYGEN([The KDE API Reference], [Version $VERSION])
+KDE_CHECK_BINUTILS


[prev in list] [next in list] [prev in thread] [next in thread]