From 449ece5a33da3a05875f8d22a24a5f402ed393fb Mon Sep 17 00:00:00 2001 From: jcalcote Date: Wed, 15 Apr 2009 03:43:33 +0000 Subject: [PATCH] Minor cleanup to configure script and Makefile.am files. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1082 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- Makefile.am | 1 - configure.ac | 1 - flaim/Makefile.am | 1 - flaim/configure.ac | 27 +++++++-------- flaim/docs/Makefile.am | 1 - flaim/docs/doxygen/Makefile.am | 1 - flaim/sample/Makefile.am | 1 - flaim/src/Makefile.am | 1 - ftk/Makefile.am | 1 - ftk/configure.ac | 26 +++++++------- ftk/docs/Makefile.am | 1 - ftk/obs/Makefile.am | 1 - ftk/src/Makefile.am | 1 - ftk/util/Makefile.am | 5 ++- sql/Makefile.am | 1 - sql/configure.ac | 27 +++++++-------- sql/obs/Makefile.am | 1 - xflaim/Makefile.am | 1 - xflaim/configure.ac | 43 +++++++++++------------- xflaim/docs/Makefile.am | 1 - xflaim/docs/doxygen/Makefile.am | 1 - xflaim/obs/Makefile.am | 1 - xflaim/sample/Makefile.am | 1 - xflaim/src/Makefile.am | 1 - xflaim/src/cs/Makefile.am | 4 +-- xflaim/src/cs/wrapper/Makefile.am | 1 - xflaim/src/java/Makefile.am | 3 +- xflaim/src/java/wrapper/Makefile.am | 1 - xflaim/src/java/wrapper/util/Makefile.am | 1 - xflaim/util/Makefile.am | 5 ++- 30 files changed, 62 insertions(+), 100 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5baba6e..f956592 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,4 +13,3 @@ dist-hook: -rm -rf `find $(distdir) -name .svn` .PHONY: rpms srcrpm - diff --git a/configure.ac b/configure.ac index 7c1b680..408ea82 100644 --- a/configure.ac +++ b/configure.ac @@ -11,4 +11,3 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SUBDIRS([ftk flaim sql xflaim]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT - diff --git a/flaim/Makefile.am b/flaim/Makefile.am index 732dc06..20994ba 100644 --- a/flaim/Makefile.am +++ b/flaim/Makefile.am @@ -16,4 +16,3 @@ dist-hook: -rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms - diff --git a/flaim/configure.ac b/flaim/configure.ac index 6945b77..4bc1392 100644 --- a/flaim/configure.ac +++ b/flaim/configure.ac @@ -32,10 +32,10 @@ AC_ARG_ENABLE([debug], # Check for doxygen program. if test -z "$DOXYGEN"; then - echo "-----------------------------------------" - echo " No Doxygen program found - continuing" - echo " without Doxygen documentation support." - echo "-----------------------------------------" + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD + echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD + echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD fi AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x]) @@ -59,6 +59,14 @@ AC_C_INLINE # Checks for library functions. AC_CHECK_FUNCS([atexit strchr]) +# Configure for large files, even on 32-bit systems +AC_SYS_LARGEFILE + +# Configure DEBUG source code, if requested. +if test "x$debug" = xyes; then + AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) +fi + # Configure compiler and platform flags and options. # This stuff was in the original makefile... # Personally, I believe -O2 does as good a job as @@ -80,16 +88,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls # CXXFLAGS="$CXXFLAGS $gcc_opt_flags" #fi -# Configure DEBUG source code, if requested. -if test "x$debug" = xyes; then - AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) -fi - -# Configure global pre-processor definitions. -AC_SYS_LARGEFILE -# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files]) -# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files]) - # Configure supported platforms' compiler and linker flags. case $host in sparc-*-solaris*) @@ -142,4 +140,3 @@ echo " FTK Include....: ${FTKINC:-INSTALLED} Doxygen........: ${DOXYGEN:-NONE} " - diff --git a/flaim/docs/Makefile.am b/flaim/docs/Makefile.am index 40015b4..a481fc7 100644 --- a/flaim/docs/Makefile.am +++ b/flaim/docs/Makefile.am @@ -10,4 +10,3 @@ doc_DATA =\ FLAIMArchitecture.odg\ FLAIMArchitecture.png\ introduction_to_flaim_4.doc - diff --git a/flaim/docs/doxygen/Makefile.am b/flaim/docs/doxygen/Makefile.am index 10c7121..580edb1 100644 --- a/flaim/docs/doxygen/Makefile.am +++ b/flaim/docs/doxygen/Makefile.am @@ -13,4 +13,3 @@ CLEANFILES = doxywarn.txt doxygen.stamp $(docpkg) clean-local: -rm -rf html - diff --git a/flaim/sample/Makefile.am b/flaim/sample/Makefile.am index 88945e7..ceb23f7 100644 --- a/flaim/sample/Makefile.am +++ b/flaim/sample/Makefile.am @@ -6,4 +6,3 @@ FLAIM_LIB=../src/libflaim.la sample_SOURCES = sample.cpp sample_CPPFLAGS = $(FLAIM_INC) $(FTK_INCLUDE) sample_LDADD = $(FLAIM_LIB) - diff --git a/flaim/src/Makefile.am b/flaim/src/Makefile.am index 4e52d42..653cb9f 100644 --- a/flaim/src/Makefile.am +++ b/flaim/src/Makefile.am @@ -119,4 +119,3 @@ libflaim_la_SOURCES = \ libflaim_la_CPPFLAGS = $(FTK_INCLUDE) libflaim_la_LIBADD = $(FTK_LTLIB) libflaim_la_LDFLAGS = -version-info 5:2:0 - diff --git a/ftk/Makefile.am b/ftk/Makefile.am index 753f6c9..5b76892 100644 --- a/ftk/Makefile.am +++ b/ftk/Makefile.am @@ -20,4 +20,3 @@ dist-hook: -rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms - diff --git a/ftk/configure.ac b/ftk/configure.ac index ccae2c6..6e6d15f 100644 --- a/ftk/configure.ac +++ b/ftk/configure.ac @@ -34,10 +34,10 @@ AC_ARG_ENABLE([openssl], # Check for doxygen program. if test -z "$DOXYGEN"; then - echo "-----------------------------------------" - echo " No Doxygen program found - continuing" - echo " without Doxygen documentation support." - echo "-----------------------------------------" + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD + echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD + echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD fi AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) @@ -83,6 +83,14 @@ AC_FUNC_MALLOC AC_FUNC_MKTIME AC_CHECK_FUNCS([atexit fdatasync ftruncate getcwd gethostbyaddr gethostbyname gethostname gethrtime gettimeofday inet_ntoa localtime_r memmove memset mkdir pstat_getdynamic realpath rmdir select socket strchr strrchr strstr]) +# Configure for large files, even in 32-bit environments +AC_SYS_LARGEFILE + +# Configure DEBUG source code, if requested. +if test "x$debug" = xyes; then + AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) +fi + # Configure compiler and platform flags and options. # This stuff was in the original makefile... # Personally, I believe -O2 does as good a job as @@ -104,16 +112,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls # CXXFLAGS="$CXXFLAGS $gcc_opt_flags" #fi -# Configure DEBUG source code, if requested. -if test "x$debug" = xyes; then - AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) -fi - -# Configure global pre-processor definitions. -AC_SYS_LARGEFILE -# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files]) -# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files]) - # Configure supported platforms' compiler and linker flags. case $host in sparc-*-solaris*) diff --git a/ftk/docs/Makefile.am b/ftk/docs/Makefile.am index 10c7121..580edb1 100644 --- a/ftk/docs/Makefile.am +++ b/ftk/docs/Makefile.am @@ -13,4 +13,3 @@ CLEANFILES = doxywarn.txt doxygen.stamp $(docpkg) clean-local: -rm -rf html - diff --git a/ftk/obs/Makefile.am b/ftk/obs/Makefile.am index b529c53..40d95c9 100644 --- a/ftk/obs/Makefile.am +++ b/ftk/obs/Makefile.am @@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec) rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) .PHONY: rpmcheck srcrpm rpms - diff --git a/ftk/src/Makefile.am b/ftk/src/Makefile.am index e11b4fa..bc21e1d 100644 --- a/ftk/src/Makefile.am +++ b/ftk/src/Makefile.am @@ -42,4 +42,3 @@ libflaimtk_la_SOURCES = \ ftkxml.cpp libflaimtk_la_LDFLAGS = -version-info 0:0:0 - diff --git a/ftk/util/Makefile.am b/ftk/util/Makefile.am index 096e025..36a90db 100644 --- a/ftk/util/Makefile.am +++ b/ftk/util/Makefile.am @@ -1,5 +1,5 @@ -FTKINC=-I$(top_srcdir)/src -FTKLIB=../src/libflaimtk.la +FTKINC = -I$(top_srcdir)/src +FTKLIB = ../src/libflaimtk.la check_PROGRAMS = ftktest @@ -8,4 +8,3 @@ ftktest_CPPFLAGS = $(FTKINC) ftktest_LDADD = $(FTKLIB) TESTS = ftktest - diff --git a/sql/Makefile.am b/sql/Makefile.am index c4c89d1..2f24f2d 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -16,4 +16,3 @@ dist-hook: -rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms - diff --git a/sql/configure.ac b/sql/configure.ac index b9d94ac..566670b 100644 --- a/sql/configure.ac +++ b/sql/configure.ac @@ -31,10 +31,10 @@ AC_ARG_ENABLE([debug], # Check for doxygen program. if test -z "$DOXYGEN"; then - echo "-----------------------------------------" - echo " No Doxygen program found - continuing" - echo " without Doxygen documentation support." - echo "-----------------------------------------" + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD + echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD + echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD fi AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x]) @@ -57,6 +57,14 @@ AC_C_INLINE # Checks for library functions. +# Configure for large files, even on 32-bit systems +AC_SYS_LARGEFILE + +# Configure DEBUG source code, if requested. +if test "x$debug" = xyes; then + AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) +fi + # Configure compiler and platform flags and options. # This stuff was in the original makefile... # Personally, I believe -O2 does as good a job as @@ -78,16 +86,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls # CXXFLAGS="$CXXFLAGS $gcc_opt_flags" #fi -# Configure DEBUG source code, if requested. -if test "x$debug" = xyes; then - AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) -fi - -# Configure global pre-processor definitions. -AC_SYS_LARGEFILE -# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files]) -# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files]) - # Configure supported platforms' compiler and linker flags. case $host in sparc-*-solaris*) @@ -135,4 +133,3 @@ echo " FTK Include....: ${FTKINC:-INSTALLED} Doxygen........: ${DOXYGEN:-NONE} " - diff --git a/sql/obs/Makefile.am b/sql/obs/Makefile.am index b529c53..40d95c9 100644 --- a/sql/obs/Makefile.am +++ b/sql/obs/Makefile.am @@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec) rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) .PHONY: rpmcheck srcrpm rpms - diff --git a/xflaim/Makefile.am b/xflaim/Makefile.am index 732dc06..20994ba 100644 --- a/xflaim/Makefile.am +++ b/xflaim/Makefile.am @@ -16,4 +16,3 @@ dist-hook: -rm -rf `find $(distdir) -name .svn` .PHONY: srcrpm rpms - diff --git a/xflaim/configure.ac b/xflaim/configure.ac index bcfc409..b587b9b 100644 --- a/xflaim/configure.ac +++ b/xflaim/configure.ac @@ -37,28 +37,28 @@ if test -z "$JAVAC"; then have_java=no; fi if test -z "$JAVAH"; then have_java=no; fi if test -z "$JAR"; then have_java=no; fi if test "x$have_java" = xno; then - echo "-----------------------------------------" - echo " Some Java tools not found - continuing" - echo " without XFLAIM JNI support." - echo "-----------------------------------------" + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD + echo " Some Java tools not found - continuing" >&AS_MESSAGE_LOG_FD + echo " without XFLAIM JNI support." >&AS_MESSAGE_LOG_FD + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD fi AM_CONDITIONAL([HAVE_JAVA], [test "x$have_java" = xyes]) # Check for CSharp compiler. if test -z "$CSC"; then - echo "-----------------------------------------" - echo " No CSharp compiler found - continuing" - echo " without XFLAIM CSHARP support." - echo "-----------------------------------------" + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD + echo " No CSharp compiler found - continuing" >&AS_MESSAGE_LOG_FD + echo " without XFLAIM CSHARP support." >&AS_MESSAGE_LOG_FD + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD fi AM_CONDITIONAL([HAVE_CSHARP], [test -n "$CSC"]) # Check for doxygen program. if test -z "$DOXYGEN"; then - echo "-----------------------------------------" - echo " No Doxygen program found - continuing" - echo " without Doxygen documentation support." - echo "-----------------------------------------" + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD + echo " No Doxygen program found - continuing" >&AS_MESSAGE_LOG_FD + echo " without Doxygen documentation support." >&AS_MESSAGE_LOG_FD + echo "-----------------------------------------" >&AS_MESSAGE_LOG_FD fi AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x]) @@ -84,6 +84,14 @@ AC_TYPE_SIZE_T # Checks for library functions. AC_CHECK_FUNCS([atexit strerror]) +# Configure for large files, even on 32-bit systems +AC_SYS_LARGEFILE + +# Configure DEBUG source code, if requested. +if test "x$debug" = xyes; then + AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) +fi + # Configure compiler and platform flags and options. # This stuff was in the original makefile... # Personally, I believe -O2 does as good a job as @@ -105,16 +113,6 @@ gcc_opt_flags="-O -foptimize-sibling-calls # CXXFLAGS="$CXXFLAGS $gcc_opt_flags" #fi -# Configure DEBUG source code, if requested. -if test "x$debug" = xyes; then - AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features]) -fi - -# Configure global pre-processor definitions. -AC_SYS_LARGEFILE -# AC_DEFINE([_LARGEFILE64_SOURCE], [], [Define for 64-bit data files]) -# AC_DEFINE([_LARGEFILE_SOURCE], [], [Define for 64-bit data files]) - # Configure supported platforms' compiler and linker flags. case $host in sparc-*-solaris*) @@ -176,4 +174,3 @@ echo " Javadoc Utility: ${JAVADOC:-NONE} Doxygen........: ${DOXYGEN:-NONE} " - diff --git a/xflaim/docs/Makefile.am b/xflaim/docs/Makefile.am index 82cabcc..1cf93cb 100644 --- a/xflaim/docs/Makefile.am +++ b/xflaim/docs/Makefile.am @@ -5,4 +5,3 @@ if HAVE_DOXYGEN endif doc_DATA = XFLAIMArchitecture.odg XFLAIMArchitecture.png - diff --git a/xflaim/docs/doxygen/Makefile.am b/xflaim/docs/doxygen/Makefile.am index 10c7121..580edb1 100644 --- a/xflaim/docs/doxygen/Makefile.am +++ b/xflaim/docs/doxygen/Makefile.am @@ -13,4 +13,3 @@ CLEANFILES = doxywarn.txt doxygen.stamp $(docpkg) clean-local: -rm -rf html - diff --git a/xflaim/obs/Makefile.am b/xflaim/obs/Makefile.am index b529c53..40d95c9 100644 --- a/xflaim/obs/Makefile.am +++ b/xflaim/obs/Makefile.am @@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec) rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec) .PHONY: rpmcheck srcrpm rpms - diff --git a/xflaim/sample/Makefile.am b/xflaim/sample/Makefile.am index 957703d..f67e968 100644 --- a/xflaim/sample/Makefile.am +++ b/xflaim/sample/Makefile.am @@ -6,4 +6,3 @@ XFLAIM_LIB=../src/libxflaim.la sample_SOURCES = sample.cpp sample_CPPFLAGS = $(XFLAIM_INC) $(FTK_INCLUDE) sample_LDADD = $(XFLAIM_LIB) - diff --git a/xflaim/src/Makefile.am b/xflaim/src/Makefile.am index 5faea08..c36cd4d 100644 --- a/xflaim/src/Makefile.am +++ b/xflaim/src/Makefile.am @@ -103,4 +103,3 @@ libxflaim_la_SOURCES = \ libxflaim_la_CPPFLAGS = $(FTK_INCLUDE) libxflaim_la_LIBADD = $(JNI_LIBADD) $(CSI_LIBADD) $(FTK_LTLIB) libxflaim_la_LDFLAGS = -version-info 3:2:0 - diff --git a/xflaim/src/cs/Makefile.am b/xflaim/src/cs/Makefile.am index 3903593..13b8cca 100644 --- a/xflaim/src/cs/Makefile.am +++ b/xflaim/src/cs/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = wrapper -XFLAIM_INCLUDE=-I$(srcdir)/.. +XFLAIM_INCLUDE = -I$(srcdir)/.. noinst_LTLIBRARIES = libxfcsi.la @@ -17,5 +17,3 @@ libxfcsi_la_SOURCES = \ Query.cpp libxfcsi_la_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE) - - diff --git a/xflaim/src/cs/wrapper/Makefile.am b/xflaim/src/cs/wrapper/Makefile.am index 7f7abe1..c302585 100644 --- a/xflaim/src/cs/wrapper/Makefile.am +++ b/xflaim/src/cs/wrapper/Makefile.am @@ -95,4 +95,3 @@ cstest_script: cstest.exe libxflaim.so echo "#!/bin/sh" > cstest_script echo "$(CSVM) cstest.exe" >> cstest_script chmod 0755 cstest_script - diff --git a/xflaim/src/java/Makefile.am b/xflaim/src/java/Makefile.am index d95c678..a8db20b 100644 --- a/xflaim/src/java/Makefile.am +++ b/xflaim/src/java/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = wrapper -XFLAIM_INCLUDE=-I$(srcdir)/.. +XFLAIM_INCLUDE = -I$(srcdir)/.. noinst_LTLIBRARIES = libxfjni.la @@ -21,4 +21,3 @@ libxfjni_la_SOURCES = \ jquery.cpp libxfjni_la_CPPFLAGS = $(XFLAIM_INCLUDE) $(FTK_INCLUDE) - diff --git a/xflaim/src/java/wrapper/Makefile.am b/xflaim/src/java/wrapper/Makefile.am index ff47de9..e368338 100644 --- a/xflaim/src/java/wrapper/Makefile.am +++ b/xflaim/src/java/wrapper/Makefile.am @@ -92,4 +92,3 @@ dist_noinst_JAVA = \ $(pkgpath)/UTransStats.java \ $(pkgpath)/XFlaimException.java \ $(pkgpath)/XPathAxis.java - diff --git a/xflaim/src/java/wrapper/util/Makefile.am b/xflaim/src/java/wrapper/util/Makefile.am index 176e076..ef8a057 100644 --- a/xflaim/src/java/wrapper/util/Makefile.am +++ b/xflaim/src/java/wrapper/util/Makefile.am @@ -35,4 +35,3 @@ dist_noinst_JAVA = \ $(pkgpath)/UITools.java \ $(pkgpath)/XEdit.java \ $(pkgpath)/XFileFilter.java - diff --git a/xflaim/util/Makefile.am b/xflaim/util/Makefile.am index c3b58e5..fdbff5f 100644 --- a/xflaim/util/Makefile.am +++ b/xflaim/util/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = dbdiff.cpp dbdiff.h domedit.cpp diffbackups.cpp xmlfiles -XFLAIM_INCLUDE=-I$(top_srcdir)/src -XFLAIM_LDADD=../src/libxflaim.la +XFLAIM_INCLUDE = -I$(top_srcdir)/src +XFLAIM_LDADD = ../src/libxflaim.la ## Utility Programs @@ -205,4 +205,3 @@ clean-local: -rm -rf tst.bak -rm -f *.xml -rm -f copy-xml-files.stamp -