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
This commit is contained in:
jcalcote
2009-04-15 03:43:33 +00:00
parent 67322ee9db
commit 449ece5a33
30 changed files with 62 additions and 100 deletions

View File

@@ -16,4 +16,3 @@ dist-hook:
-rm -rf `find $(distdir) -name .svn`
.PHONY: srcrpm rpms

View File

@@ -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}
"

View File

@@ -23,4 +23,3 @@ rpms: rpmcheck $(rpmspec)
rpmbuild -ba $(rpmmacros) $(rpmopts) $(rpmspec)
.PHONY: rpmcheck srcrpm rpms