Cleanup build system with respect to CFLAGS so they are consistent throughout and
the right flags get added for the right things and move all of this in one place in configure.ac removing everything from the Makefile.am files. (Logical change 1.239)edge.strict_endians
cantab.net!aia21
parent
fafd832996
commit
e92992ed63
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.57 for ntfsprogs 1.8.0beta2.
|
||||
# Generated by GNU Autoconf 2.57 for ntfsprogs 1.8.0.
|
||||
#
|
||||
# Report bugs to <linux-ntfs-dev@lists.sourceforge.net>.
|
||||
#
|
||||
|
|
@ -427,8 +427,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='ntfsprogs'
|
||||
PACKAGE_TARNAME='ntfsprogs'
|
||||
PACKAGE_VERSION='1.8.0beta2'
|
||||
PACKAGE_STRING='ntfsprogs 1.8.0beta2'
|
||||
PACKAGE_VERSION='1.8.0'
|
||||
PACKAGE_STRING='ntfsprogs 1.8.0'
|
||||
PACKAGE_BUGREPORT='linux-ntfs-dev@lists.sourceforge.net'
|
||||
|
||||
ac_unique_file="config.h.in"
|
||||
|
|
@ -470,7 +470,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DEBUG_TRUE DEBUG_FALSE REALLYSTATIC_TRUE REALLYSTATIC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE LN_S RANLIB ac_ct_RANLIB PKG_CONFIG LIBNTFS_GNOMEVFS_CFLAGS LIBNTFS_GNOMEVFS_LIBS ENABLE_GNOME_VFS_TRUE ENABLE_GNOME_VFS_FALSE ECHO CPP EGREP LIBTOOL LIBTOOL_DEPS all_includes all_libraries AUTODIRS GCC_NEEDS_MS_EXTENSIONS_TRUE GCC_NEEDS_MS_EXTENSIONS_FALSE LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT REALLYSTATIC_TRUE REALLYSTATIC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE LN_S RANLIB ac_ct_RANLIB PKG_CONFIG LIBNTFS_GNOMEVFS_CFLAGS LIBNTFS_GNOMEVFS_LIBS ENABLE_GNOME_VFS_TRUE ENABLE_GNOME_VFS_FALSE ECHO CPP EGREP LIBTOOL LIBTOOL_DEPS all_includes all_libraries AUTODIRS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -939,7 +939,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures ntfsprogs 1.8.0beta2 to adapt to many kinds of systems.
|
||||
\`configure' configures ntfsprogs 1.8.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1006,7 +1006,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of ntfsprogs 1.8.0beta2:";;
|
||||
short | recursive ) echo "Configuration of ntfsprogs 1.8.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1106,7 +1106,7 @@ fi
|
|||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
ntfsprogs configure 1.8.0beta2
|
||||
ntfsprogs configure 1.8.0
|
||||
generated by GNU Autoconf 2.57
|
||||
|
||||
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
|
||||
|
|
@ -1121,7 +1121,7 @@ cat >&5 <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by ntfsprogs $as_me 1.8.0beta2, which was
|
||||
It was created by ntfsprogs $as_me 1.8.0, which was
|
||||
generated by GNU Autoconf 2.57. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -1800,7 +1800,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE=ntfsprogs
|
||||
VERSION=1.8.0beta2
|
||||
VERSION=1.8.0
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -2032,16 +2032,6 @@ fi;
|
|||
|
||||
|
||||
|
||||
if test "$enable_debug" = yes; then
|
||||
DEBUG_TRUE=
|
||||
DEBUG_FALSE='#'
|
||||
else
|
||||
DEBUG_TRUE='#'
|
||||
DEBUG_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "$enable_really_static" = yes; then
|
||||
REALLYSTATIC_TRUE=
|
||||
REALLYSTATIC_FALSE='#'
|
||||
|
|
@ -2051,11 +2041,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
# Do not discard 'CFLAGS' as they may have been passed us by rpmbuild(8)
|
||||
if test "$USE_MAINTAINER_MODE" = "yes";then
|
||||
CFLAGS="$CFLAGS -ggdb3 -Wall -Wstrict-prototypes -Wsign-compare" ## FIXME: fix all source: -Wsign-compare
|
||||
fi
|
||||
|
||||
# Checks for programs.
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
|
|
@ -3274,7 +3259,7 @@ else
|
|||
|
||||
fi;
|
||||
compile_gnome_vfs=false
|
||||
if test "$enable_gnome_vfs" != "no";then
|
||||
if test "$enable_gnome_vfs" != "no"; then
|
||||
|
||||
succeeded=no
|
||||
|
||||
|
|
@ -3369,7 +3354,7 @@ echo "${ECHO_T}$LIBNTFS_GNOMEVFS_LIBS" >&6
|
|||
compile_gnome_vfs=true
|
||||
else
|
||||
|
||||
if test "$enable_gnome_vfs" = "yes";then
|
||||
if test "$enable_gnome_vfs" = "yes"; then
|
||||
{ { echo "$as_me:$LINENO: error: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares." >&5
|
||||
echo "$as_me: error: Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
|
|
@ -4995,7 +4980,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
|||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4998 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4983 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5524,7 +5509,7 @@ chmod -w .
|
|||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
|
||||
compiler_c_o=no
|
||||
if { (eval echo configure:5527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
if { (eval echo configure:5512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
|
|
@ -6708,7 +6693,7 @@ linux-gnu*)
|
|||
libsuff=
|
||||
case "$host_cpu" in
|
||||
x86_64*|s390x*)
|
||||
echo '#line 6711 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6696 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7380,7 +7365,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7383 "configure"
|
||||
#line 7368 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -7478,7 +7463,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7481 "configure"
|
||||
#line 7466 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -8224,16 +8209,6 @@ all_includes="$all_includes $USER_INCLUDES"
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Get compiler name
|
||||
if test ! -z "$CC"; then
|
||||
_cc="$CC"
|
||||
|
|
@ -8252,7 +8227,7 @@ if test -z "$cc_version"; then
|
|||
cc_major=1
|
||||
cc_minor=1
|
||||
fi
|
||||
if test $cc_major -lt 2 -o \( $cc_major -eq 2 -a $cc_minor -lt 96 \) ; then
|
||||
if test $cc_major -lt 2 -o \( $cc_major -eq 2 -a $cc_minor -lt 96 \); then
|
||||
cc_version="$cc_version, bad"
|
||||
echo "$as_me:$LINENO: result: $cc_version" >&5
|
||||
echo "${ECHO_T}$cc_version" >&6
|
||||
|
|
@ -8268,17 +8243,36 @@ cc_version="$cc_version, ok"
|
|||
echo "$as_me:$LINENO: result: $cc_version" >&5
|
||||
echo "${ECHO_T}$cc_version" >&6
|
||||
|
||||
# Add -fms-extensions for gcc-3.2+.
|
||||
# Add our compiler switches not discarding 'CFLAGS' as they may have been
|
||||
# passed to us by rpmbuild(8).
|
||||
# We add -Wall to enable compiler warnings and define _FILE_OFFSET_BITS to 64
|
||||
# enable 64-bit (device) file access functions and parameters.
|
||||
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -Wall"
|
||||
|
||||
|
||||
if test $cc_major -gt 3 -o \( $cc_major -eq 3 -a $cc_minor -ge 2 \); then
|
||||
GCC_NEEDS_MS_EXTENSIONS_TRUE=
|
||||
GCC_NEEDS_MS_EXTENSIONS_FALSE='#'
|
||||
else
|
||||
GCC_NEEDS_MS_EXTENSIONS_TRUE='#'
|
||||
GCC_NEEDS_MS_EXTENSIONS_FALSE=
|
||||
# Add extra warnings if in maintainer mode.
|
||||
if test "$USE_MAINTAINER_MODE" = "yes";then
|
||||
CFLAGS="$CFLAGS -Wstrict-prototypes -Wsign-compare"
|
||||
fi
|
||||
|
||||
# Add -fms-extensions for gcc-3.2+.
|
||||
if test $cc_major -gt 3 -o \( $cc_major -eq 3 -a $cc_minor -ge 2 \); then
|
||||
CFLAGS="$CFLAGS -fms-extensions"
|
||||
fi
|
||||
|
||||
# Add debugging switches if in debug mode.
|
||||
if test "$enable_debug" = "yes"; then
|
||||
CFLAGS="$CFLAGS -ggdb3 -DDEBUG"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Checks for libraries.
|
||||
|
||||
|
|
@ -10863,13 +10857,6 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
|
|||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
echo "$as_me: error: conditional \"DEBUG\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${REALLYSTATIC_TRUE}" && test -z "${REALLYSTATIC_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"REALLYSTATIC\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
|
|
@ -10891,13 +10878,6 @@ echo "$as_me: error: conditional \"ENABLE_GNOME_VFS\" was never defined.
|
|||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${GCC_NEEDS_MS_EXTENSIONS_TRUE}" && test -z "${GCC_NEEDS_MS_EXTENSIONS_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"GCC_NEEDS_MS_EXTENSIONS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
echo "$as_me: error: conditional \"GCC_NEEDS_MS_EXTENSIONS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
: ${CONFIG_STATUS=./config.status}
|
||||
ac_clean_files_save=$ac_clean_files
|
||||
|
|
@ -11167,7 +11147,7 @@ _ASBOX
|
|||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by ntfsprogs $as_me 1.8.0beta2, which was
|
||||
This file was extended by ntfsprogs $as_me 1.8.0, which was
|
||||
generated by GNU Autoconf 2.57. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -11230,7 +11210,7 @@ _ACEOF
|
|||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
ntfsprogs config.status 1.8.0beta2
|
||||
ntfsprogs config.status 1.8.0
|
||||
configured by $0, generated by GNU Autoconf 2.57,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
@ -11479,8 +11459,6 @@ s,@SET_MAKE@,$SET_MAKE,;t t
|
|||
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
|
||||
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
|
||||
s,@MAINT@,$MAINT,;t t
|
||||
s,@DEBUG_TRUE@,$DEBUG_TRUE,;t t
|
||||
s,@DEBUG_FALSE@,$DEBUG_FALSE,;t t
|
||||
s,@REALLYSTATIC_TRUE@,$REALLYSTATIC_TRUE,;t t
|
||||
s,@REALLYSTATIC_FALSE@,$REALLYSTATIC_FALSE,;t t
|
||||
s,@CC@,$CC,;t t
|
||||
|
|
@ -11513,8 +11491,6 @@ s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
|
|||
s,@all_includes@,$all_includes,;t t
|
||||
s,@all_libraries@,$all_libraries,;t t
|
||||
s,@AUTODIRS@,$AUTODIRS,;t t
|
||||
s,@GCC_NEEDS_MS_EXTENSIONS_TRUE@,$GCC_NEEDS_MS_EXTENSIONS_TRUE,;t t
|
||||
s,@GCC_NEEDS_MS_EXTENSIONS_FALSE@,$GCC_NEEDS_MS_EXTENSIONS_FALSE,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
CEOF
|
||||
|
|
|
|||
54
configure.ac
54
configure.ac
|
|
@ -22,7 +22,7 @@
|
|||
#
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT(ntfsprogs, 1.8.0beta2, linux-ntfs-dev@lists.sourceforge.net)
|
||||
AC_INIT(ntfsprogs, 1.8.0, linux-ntfs-dev@lists.sourceforge.net)
|
||||
AC_CANONICAL_TARGET([])
|
||||
AC_CONFIG_SRCDIR([config.h.in])
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
|
|
@ -58,14 +58,8 @@ AC_ARG_ENABLE(really-static,
|
|||
enable_really_static=no
|
||||
)
|
||||
|
||||
AM_CONDITIONAL(DEBUG, test "$enable_debug" = yes)
|
||||
AM_CONDITIONAL(REALLYSTATIC, test "$enable_really_static" = yes)
|
||||
|
||||
# Do not discard 'CFLAGS' as they may have been passed us by rpmbuild(8)
|
||||
if test "$USE_MAINTAINER_MODE" = "yes";then
|
||||
CFLAGS="$CFLAGS -ggdb3 -Wall -Wstrict-prototypes -Wsign-compare" ## FIXME: fix all source: -Wsign-compare
|
||||
fi
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
|
|
@ -78,11 +72,11 @@ AC_ARG_ENABLE(gnome-vfs,
|
|||
enable_gnome_vfs=auto
|
||||
)
|
||||
compile_gnome_vfs=false
|
||||
if test "$enable_gnome_vfs" != "no";then
|
||||
if test "$enable_gnome_vfs" != "no"; then
|
||||
PKG_CHECK_MODULES(LIBNTFS_GNOMEVFS, [glib-2.0 gthread-2.0 gnome-vfs-module-2.0],
|
||||
[ compile_gnome_vfs=true ],
|
||||
[
|
||||
if test "$enable_gnome_vfs" = "yes";then
|
||||
if test "$enable_gnome_vfs" = "yes"; then
|
||||
AC_MSG_ERROR([Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares.])
|
||||
else
|
||||
AC_MSG_WARN([Linux-NTFS Gnome VFS module requires glib-2.0 and gnome-vfs-module-2.0 librares.])
|
||||
|
|
@ -109,16 +103,6 @@ all_includes="$all_includes $USER_INCLUDES"
|
|||
AC_SUBST(all_includes)
|
||||
AC_SUBST(all_libraries)
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
|
||||
AC_SUBST(LIBNTFS_GNOMEVFS_CFLAGS)
|
||||
AC_SUBST(LIBNTFS_GNOMEVFS_LIBS)
|
||||
|
||||
AC_SUBST(AUTODIRS)
|
||||
|
||||
# Get compiler name
|
||||
if test ! -z "$CC"; then
|
||||
_cc="$CC"
|
||||
|
|
@ -136,7 +120,7 @@ if test -z "$cc_version"; then
|
|||
cc_major=1
|
||||
cc_minor=1
|
||||
fi
|
||||
if test $cc_major -lt 2 -o \( $cc_major -eq 2 -a $cc_minor -lt 96 \) ; then
|
||||
if test $cc_major -lt 2 -o \( $cc_major -eq 2 -a $cc_minor -lt 96 \); then
|
||||
cc_version="$cc_version, bad"
|
||||
AC_MSG_RESULT($cc_version)
|
||||
AC_MSG_ERROR(Please upgrade your gcc compiler to gcc-2.96+ or gcc-3+ version!\
|
||||
|
|
@ -146,8 +130,36 @@ fi
|
|||
cc_version="$cc_version, ok"
|
||||
AC_MSG_RESULT($cc_version)
|
||||
|
||||
# Add our compiler switches not discarding 'CFLAGS' as they may have been
|
||||
# passed to us by rpmbuild(8).
|
||||
# We add -Wall to enable compiler warnings and define _FILE_OFFSET_BITS to 64
|
||||
# enable 64-bit (device) file access functions and parameters.
|
||||
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -Wall"
|
||||
|
||||
# Add extra warnings if in maintainer mode.
|
||||
if test "$USE_MAINTAINER_MODE" = "yes";then
|
||||
CFLAGS="$CFLAGS -Wstrict-prototypes -Wsign-compare"
|
||||
fi
|
||||
|
||||
# Add -fms-extensions for gcc-3.2+.
|
||||
AM_CONDITIONAL(GCC_NEEDS_MS_EXTENSIONS, test $cc_major -gt 3 -o \( $cc_major -eq 3 -a $cc_minor -ge 2 \))
|
||||
if test $cc_major -gt 3 -o \( $cc_major -eq 3 -a $cc_minor -ge 2 \); then
|
||||
CFLAGS="$CFLAGS -fms-extensions"
|
||||
fi
|
||||
|
||||
# Add debugging switches if in debug mode.
|
||||
if test "$enable_debug" = "yes"; then
|
||||
CFLAGS="$CFLAGS -ggdb3 -DDEBUG"
|
||||
fi
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
|
||||
AC_SUBST(LIBNTFS_GNOMEVFS_CFLAGS)
|
||||
AC_SUBST(LIBNTFS_GNOMEVFS_LIBS)
|
||||
|
||||
AC_SUBST(AUTODIRS)
|
||||
|
||||
# Checks for libraries.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
|
||||
# Need this to enable 64-bit (device) file access functions and parameters.
|
||||
if DEBUG
|
||||
AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
|
||||
else
|
||||
AM_CFLAGS = -D_FILE_OFFSET_BITS=64
|
||||
endif
|
||||
|
||||
linux_ntfsincludedir = $(includedir)/ntfs
|
||||
linux_ntfsinclude_HEADERS = \
|
||||
attrib.h \
|
||||
|
|
|
|||
|
|
@ -96,10 +96,6 @@ am__include = @am__include@
|
|||
am__quote = @am__quote@
|
||||
install_sh = @install_sh@
|
||||
|
||||
# Need this to enable 64-bit (device) file access functions and parameters.
|
||||
@DEBUG_TRUE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG
|
||||
@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
|
||||
|
||||
linux_ntfsincludedir = $(includedir)/ntfs
|
||||
linux_ntfsinclude_HEADERS = \
|
||||
attrib.h \
|
||||
|
|
|
|||
|
|
@ -29,20 +29,6 @@ LTVERSION_LIBNTFS = 5:0:0
|
|||
LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0
|
||||
|
||||
|
||||
# Later gcc require -fms-extensions to work.
|
||||
if GCC_NEEDS_MS_EXTENSIONS
|
||||
GCCflag = -fms-extensions
|
||||
else
|
||||
GCCflag =
|
||||
endif
|
||||
|
||||
# Need this to enable 64-bit (device) file access functions and parameters.
|
||||
if DEBUG
|
||||
AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG $(GCCflag)
|
||||
else
|
||||
AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall $(GCCflag)
|
||||
endif
|
||||
|
||||
linux_ntfsincludedir = -I$(top_srcdir)/include
|
||||
|
||||
lib_LTLIBRARIES = libntfs.la
|
||||
|
|
@ -77,7 +63,7 @@ endif
|
|||
libntfs_gnomevfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS_GNOMEVFS)
|
||||
libntfs_gnomevfs_la_LIBADD = libntfs.la
|
||||
libntfs_gnomevfs_la_LIBS = $(LIBNTFS_GNOMEVFS_LIBS)
|
||||
libntfs_gnomevfs_la_CFLAGS = $(LIBNTFS_GNOMEVFS_CFLAGS) $(GCCflag)
|
||||
libntfs_gnomevfs_la_CFLAGS = $(LIBNTFS_GNOMEVFS_CFLAGS)
|
||||
libntfs_gnomevfs_la_SOURCES = \
|
||||
gnome-vfs-method.c \
|
||||
gnome-vfs-module.c
|
||||
|
|
|
|||
|
|
@ -1,17 +1,3 @@
|
|||
# Later gcc require -fms-extensions to work.
|
||||
if GCC_NEEDS_MS_EXTENSIONS
|
||||
GCCflag = -fms-extensions
|
||||
else
|
||||
GCCflag =
|
||||
endif
|
||||
|
||||
# Need this to enable 64-bit (device) file access functions and parameters.
|
||||
if DEBUG
|
||||
AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG $(GCCflag)
|
||||
else
|
||||
AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall $(GCCflag)
|
||||
endif
|
||||
|
||||
if REALLYSTATIC
|
||||
AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a
|
||||
AM_LFLAGS = -static
|
||||
|
|
|
|||
|
|
@ -95,15 +95,6 @@ all_libraries = @all_libraries@
|
|||
am__include = @am__include@
|
||||
am__quote = @am__quote@
|
||||
install_sh = @install_sh@
|
||||
|
||||
# Later gcc require -fms-extensions to work.
|
||||
@GCC_NEEDS_MS_EXTENSIONS_TRUE@GCCflag = -fms-extensions
|
||||
@GCC_NEEDS_MS_EXTENSIONS_FALSE@GCCflag =
|
||||
|
||||
# Need this to enable 64-bit (device) file access functions and parameters.
|
||||
@DEBUG_TRUE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG $(GCCflag)
|
||||
@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall $(GCCflag)
|
||||
|
||||
@REALLYSTATIC_TRUE@AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a
|
||||
@REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la
|
||||
@REALLYSTATIC_TRUE@AM_LFLAGS = -static
|
||||
|
|
|
|||
Loading…
Reference in New Issue