autoconf cleanup done.

pub/config.h.in

@@ -188,16 +188,6 @@
 /* File offset bits */
 #undef _FILE_OFFSET_BITS
 
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT32_T
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-#undef _UINT8_T
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -207,18 +197,6 @@
 #undef inline
 #endif
 
-/* Define to the type of a signed integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int16_t
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef int32_t
-
-/* Define to the type of a signed integer type of width exactly 8 bits if such
-   a type exists and the standard includes do not define it. */
-#undef int8_t
-
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 
@@ -227,15 +205,3 @@
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint16_t
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint32_t
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
-   such a type exists and the standard includes do not define it. */
-#undef uint8_t

pub/configure.ac

@@ -44,60 +44,55 @@ AC_DEFINE([_FILE_OFFSET_BITS],64,[File offset bits])
 ##  Check for headers, defs needed at compile time                            ##
 ################################################################################
 
-# consistency check: is source code present?
+# Consistency check: is source code present?
 AC_CONFIG_SRCDIR([src/frida2.cpp])
+AC_CONFIG_SRCDIR([man/frida.pod])
 
 # Checks for typedefs, structures, and compiler characteristics
 AC_C_CONST
 AC_C_INLINE
-
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
-
 AC_HEADER_STDBOOL
 AC_HEADER_STDC
 
+# Checks for standard includes
+AC_FUNC_ALLOCA
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_FUNC_MKTIME
+AC_FUNC_STRFTIME
+
+AC_CHECK_FUNCS([gettimeofday],,AC_MSG_ERROR([Cannot find gettimeofday.]))
+AC_CHECK_FUNCS([memset],      ,AC_MSG_ERROR([Cannot find memset.]))
+AC_CHECK_FUNCS([mkfifo],      ,AC_MSG_ERROR([Cannot find mkfifo.]))
+AC_CHECK_FUNCS([strchr],      ,AC_MSG_ERROR([Cannot find strchr.]))
+
 AC_CHECK_HEADERS([fcntl.h],    	   ,AC_MSG_ERROR([Cannot find fcntl.h.]))
 AC_CHECK_HEADERS([math.h],   	   ,AC_MSG_ERROR([Cannot find math.h.]))
 
-# the following headers are needed for code produced by lexx and yacc
+# The following headers are needed for code produced by lexx and yacc
 AC_CHECK_HEADERS([inttypes.h], 	   ,AC_MSG_ERROR([Cannot find inttypes.h.]))
 AC_CHECK_HEADERS([libintl.h],  	   ,AC_MSG_ERROR([Cannot find libintl.h.]))
 AC_CHECK_HEADERS([malloc.h],   	   ,AC_MSG_ERROR([Cannot find malloc.h.]))
 AC_CHECK_HEADERS([unistd.h],   	   ,AC_MSG_ERROR([Cannot find unistd.h.]))
 AC_CHECK_HEADERS([stddef.h],   	   ,AC_MSG_ERROR([Cannot find stddef.h.]))
 
+# Check for non-standard includes
 AC_CHECK_HEADERS([gsl/gsl_rng.h gsl/gsl_randist.h gsl/gsl_math.h \
                   gsl/gsl_errno.h gsl/gsl_integration.h gsl/gsl_roots.h \
                   gsl/gsl_sf.h gsl/gsl_sf_debye.h],,
                  AC_MSG_ERROR([Cannot find required gsl headers.]))
 
+# Check for C includes of our own [C++ includes are checked after AC_LANG(C++)]
 AC_CHECK_HEADERS([kww.h],,  AC_MSG_ERROR([Cannot find kww.h.]))
 AC_CHECK_HEADERS([cerf.h],, AC_MSG_ERROR([Cannot find cerf.h.]))
 
-AC_FUNC_ALLOCA
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_MKTIME
-AC_FUNC_STRFTIME
-
-AC_CHECK_FUNCS([gettimeofday],,AC_MSG_ERROR([Cannot find gettimeofday.]))
-AC_CHECK_FUNCS([memset],      ,AC_MSG_ERROR([Cannot find memset.]))
-AC_CHECK_FUNCS([mkfifo],      ,AC_MSG_ERROR([Cannot find mkfifo.]))
-AC_CHECK_FUNCS([strchr],      ,AC_MSG_ERROR([Cannot find strchr.]))
-
-
 ################################################################################
 ##  Check for libraries, needed at link time                                  ##
 ################################################################################
 
-# from standard packages
+# From standard packages
 AC_SEARCH_LIBS([cos], [m],, [AC_MSG_ERROR(libm not found or corrupted)])
 AC_SEARCH_LIBS([cblas_dgemm], [gslcblas],,
 			 [AC_MSG_ERROR(libgslcblas not found or out of sync)])
@@ -108,7 +103,7 @@ AC_SEARCH_LIBS([fftw_plan_r2r_1d], [fftw3],,
 AC_SEARCH_LIBS([rl_completion_matches], [readline],,
 			 [AC_MSG_ERROR(libreadline not found or corrupted)])
 
-# written or adapted by JWu
+# From our own packages
 AC_CHECK_LIB([lmfit], [lmmin], ,
 		      [AC_MSG_ERROR(liblmfit not found or out of sync)])
 AC_CHECK_LIB([kww], [kwwp], ,
@@ -131,23 +126,26 @@ fi
 
 AC_LANG(C++)
 
-# headers:
+# Headers:
 AC_TRY_CPP([#include<boost/format.hpp>],,
 	AC_MSG_ERROR([Cannot find boost/format.hpp.]))
 AC_TRY_CPP([#include<boost/shared_ptr.hpp>],,
 	AC_MSG_ERROR([Cannot find boost/shared_ptr.hpp.]))
+
+AC_TRY_CPP([#include<trivia/file_ops.hpp>],,
+	AC_MSG_ERROR([Cannot find trivia/file_ops.hpp.]))
 AC_TRY_CPP([#include<readplus/readln.hpp>],,
-	AC_MSG_ERROR([Cannot find readln.hpp.]))
+	AC_MSG_ERROR([Cannot find readplus/readln.hpp.]))
 AC_TRY_CPP([#include<yamlfreeze/yaml.hpp>],,
         AC_MSG_ERROR([Cannot find yamlfreeze/yaml.hpp.]))
 
-# no idea how to check for cpp libraries
-AC_CHECK_LIB([yamlfreeze], [main],,
-		    	 [AC_MSG_ERROR(library yamlfreeze not found)])
-AC_CHECK_LIB([readplus], [main],,
-		    	 [AC_MSG_ERROR(library readplus not found)])
+# No idea how to check for cpp libraries
 AC_CHECK_LIB([trivia], [main], ,
                        [AC_MSG_ERROR(libtrivia not found or out of sync)])
+AC_CHECK_LIB([readplus], [main],,
+		    	 [AC_MSG_ERROR(library readplus not found)])
+AC_CHECK_LIB([yamlfreeze], [main],,
+		    	 [AC_MSG_ERROR(library yamlfreeze not found)])
 
 ################################################################################
 ##  make Makefiles                                                            ##