* Makefile.am (VERSUFFIX_s): Remove.
(bfdver.h): Replace bfd_version_suffix with bfd_version_package.
* configure.in: Replace --with-versuffix with --with-pkgversion.
* version.h: Remove BFD_VERSION_SUFFIX. Update BFD_VERSION_STRING.
* Makefile.in: Rebuilt.
* configure: Rebuilt.
binutils/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(INCLUDES): Update.
* Makefile.in: Rebuilt.
gas/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(INCLUDES, DEP_INCLUDES): Update.
* Makefile.in: Rebuilt.
gprof/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(VERSUFFIX_s): Remove.
(INCLUDES): Update.
* configure.in: Replace --with-versuffix with --with-pkgversion.
* gprof.c (main): Update version printing.
* Makefile.in: Rebuilt.
* configure: Rebuilt.
ld/
* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
(REPORT_BUGS_TO): ... this.
(INCLUDES): Update.
* Makefile.in: Rebuilt.
+2006-09-10 Nathan Sidwell <nathan@codesourcery.com>
+
+ bfd/
+ * Makefile.am (VERSUFFIX_s): Remove.
+ (bfdver.h): Replace bfd_version_suffix with bfd_version_package.
+ * configure.in: Replace --with-versuffix with --with-pkgversion.
+ * version.h: Remove BFD_VERSION_SUFFIX. Update BFD_VERSION_STRING.
+ * Makefile.in: Rebuilt.
+ * configure: Rebuilt.
+
+ binutils/
+ * Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+ (REPORT_BUGS_TO): ... this.
+ (INCLUDES): Update.
+ * Makefile.in: Rebuilt.
+
+ gas/
+ * Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+ (REPORT_BUGS_TO): ... this.
+ (INCLUDES, DEP_INCLUDES): Update.
+ * Makefile.in: Rebuilt.
+
+ gprof/
+ * Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+ (REPORT_BUGS_TO): ... this.
+ (VERSUFFIX_s): Remove.
+ (INCLUDES): Update.
+ * configure.in: Replace --with-versuffix with --with-pkgversion.
+ * gprof.c (main): Update version printing.
+ * Makefile.in: Rebuilt.
+ * configure: Rebuilt.
+
+ ld/
+ * Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+ (REPORT_BUGS_TO): ... this.
+ (INCLUDES): Update.
+ * Makefile.in: Rebuilt.
+
2006-09-08 Paul Brook <paul@codesourcery.com>
gas/
NO_WERROR = @NO_WERROR@
AM_CFLAGS = $(WARN_CFLAGS)
-VERSUFFIX_s := "\"@VERSUFFIX@\""
-
# bfd.h goes here, for now
BFD_H = bfd.h
@echo "creating $@"
@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
bfd_version_string="\"$(VERSION)\"" ;\
- bfd_version_suffix=$(VERSUFFIX_s) ;\
+ bfd_version_package="\"$(PKGVERSION)\"" ;\
if test "x$(RELEASE)" = x ; then \
bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
fi ;\
- sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_suffix@/$$bfd_version_suffix/" < $(srcdir)/version.h > $@
+ sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
# What appears below is generated by a hacked mkdep using gcc -MM.
USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-VERSUFFIX = @VERSUFFIX@
+PKGVERSION = @PKGVERSION@
WARN_CFLAGS = @WARN_CFLAGS@
WIN32LDFLAGS = @WIN32LDFLAGS@
WIN32LIBADD = @WIN32LIBADD@
bfddocdir = doc
bfdlib_LTLIBRARIES = libbfd.la
AM_CFLAGS = $(WARN_CFLAGS)
-VERSUFFIX_s := "\"@VERSUFFIX@\""
# bfd.h goes here, for now
BFD_H = bfd.h
@echo "creating $@"
@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
bfd_version_string="\"$(VERSION)\"" ;\
- bfd_version_suffix=$(VERSUFFIX_s) ;\
+ bfd_version_package="\"$(PKGVERSION)\"" ;\
if test "x$(RELEASE)" = x ; then \
bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
fi ;\
- sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_suffix@/$$bfd_version_suffix/" < $(srcdir)/version.h > $@
+ sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
# What appears below is generated by a hacked mkdep using gcc -MM.
# 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL VERSUFFIX WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l HDEFINES BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL PKGVERSION WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l HDEFINES BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both
--with-mmap try using mmap for BFD input files if available
- --with-versuffix=SFX Append SFX to the version string
+ --with-pkgversion=PKG Add PKG to the version string
--with-included-gettext use the GNU gettext library included here
Some influential environment variables:
fi
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
+# Package version. For an official FSF release, it is empty.
-# Check whether --with-versuffix or --without-versuffix was given.
-if test "${with_versuffix+set}" = set; then
- withval="$with_versuffix"
+# Check whether --with-pkgversion or --without-pkgversion was given.
+if test "${with_pkgversion+set}" = set; then
+ withval="$with_pkgversion"
case "$withval" in
- yes) { { echo "$as_me:$LINENO: error: version suffix not specified" >&5
-echo "$as_me: error: version suffix not specified" >&2;}
+ yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5
+echo "$as_me: error: package version not specified" >&2;}
{ (exit 1); exit 1; }; } ;;
- no) VERSUFFIX=" (CodeSourcery Unofficial)" ;;
- *) VERSUFFIX=" ($withval)" ;;
+ no) PKGVERSION= ;;
+ *) PKGVERSION="($withval) " ;;
esac
else
- VERSUFFIX=
+ PKGVERSION=
fi;
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@LN_S@,$LN_S,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
-s,@VERSUFFIX@,$VERSUFFIX,;t t
+s,@PKGVERSION@,$PKGVERSION,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
s,@NO_WERROR@,$NO_WERROR,;t t
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
[Define if we should default to creating read-only plt entries])
fi
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
-AC_ARG_WITH(versuffix,
- AS_HELP_STRING([--with-versuffix=SFX],
- [Append SFX to the version string]),
+# Package version. For an official FSF release, it is empty.
+AC_ARG_WITH(pkgversion,
+ AS_HELP_STRING([--with-pkgversion=PKG],
+ [Add PKG to the version string]),
[case "$withval" in
- yes) AC_MSG_ERROR([version suffix not specified]) ;;
- no) VERSUFFIX=" (CodeSourcery Unofficial)" ;;
- *) VERSUFFIX=" ($withval)" ;;
+ yes) AC_MSG_ERROR([package version not specified]) ;;
+ no) PKGVERSION= ;;
+ *) PKGVERSION="($withval) " ;;
esac],
- VERSUFFIX=
+ PKGVERSION=
)
-AC_SUBST(VERSUFFIX)
+AC_SUBST(PKGVERSION)
AM_BINUTILS_WARNINGS
#define BFD_VERSION_DATE 20060623
#define BFD_VERSION @bfd_version@
-#define BFD_VERSION_SUFFIX @bfd_version_suffix@
-#define BFD_VERSION_STRING @bfd_version_string@ BFD_VERSION_SUFFIX
+#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@
MKDEP = gcc -MM
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
INCLUDES = -D_GNU_SOURCE \
-I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
@HDEFINES@ \
-I$(srcdir)/../intl -I../intl \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-Dbin_dummy_emulation=$(EMULATION_VECTOR)
HFILES = \
.PHONY: install-html install-html-am install-html-recursive
install-html: install-html-recursive
-
+
install-html-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
BFDDIR = $(BASEDIR)/bfd
INCDIR = $(BASEDIR)/include
MKDEP = gcc -MM
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
INCLUDES = -D_GNU_SOURCE \
-I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
@HDEFINES@ \
-I$(srcdir)/../intl -I../intl \
-DLOCALEDIR="\"$(datadir)/locale\"" \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-Dbin_dummy_emulation=$(EMULATION_VECTOR)
HFILES = \
BFDDIR = $(BASEDIR)/bfd
INCDIR = $(BASEDIR)/include
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
# This is the variable actually used when we compile.
# Specify the directories to be searched for header files.
# subdirectory rather than in the source directory.
INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
-I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
# This should be parallel to INCLUDES, but should replace $(srcdir)
# in a subdirectory.
DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config \
-I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
DEP_FLAGS = -DOBJ_MAYBE_ELF \
BASEDIR = $(srcdir)/..
BFDDIR = $(BASEDIR)/bfd
INCDIR = $(BASEDIR)/include
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
# This is the variable actually used when we compile.
# Specify the directories to be searched for header files.
# subdirectory rather than in the source directory.
INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
-I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
# in a subdirectory.
DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config \
-I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
DEP_FLAGS = -DOBJ_MAYBE_ELF \
MKDEP = gcc -MM
-VERSUFFIX_s := "\"@VERSUFFIX@\""
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO"" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
-I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. \
-DVERSUFFIX=$(VERSUFFIX_s) \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
bin_PROGRAMS = gprof
INCDIR = $(BASEDIR)/include
AM_CFLAGS = $(WARN_CFLAGS)
MKDEP = gcc -MM
-VERSUFFIX_s := "\"@VERSUFFIX@\""
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
-I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I. \
- -DVERSUFFIX=$(VERSUFFIX_s) \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ -DPKGVERSION="\"$(PKGVERSION)\"" \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
# 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL VERSUFFIX REPORT_BUGS_TO CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WARN_CFLAGS NO_WERROR datarootdir docdir htmldir 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL PKGVERSION REPORT_BUGS_TO CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WARN_CFLAGS NO_WERROR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both
- --with-versuffix=SFX Append SFX to the version string
+ --with-pkgversion=PKG Add PKG to the version string
--with-bugurl=URL Direct users to URL to report a bug
--with-included-gettext use the GNU gettext library included here
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
+# Package version. For an official FSF release, it is empty.
-# Check whether --with-versuffix or --without-versuffix was given.
-if test "${with_versuffix+set}" = set; then
- withval="$with_versuffix"
+# Check whether --with-pkgversion or --without-pkgversion was given.
+if test "${with_pkgversion+set}" = set; then
+ withval="$with_pkgversion"
case "$withval" in
- yes) { { echo "$as_me:$LINENO: error: version suffix not specified" >&5
-echo "$as_me: error: version suffix not specified" >&2;}
+ yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5
+echo "$as_me: error: package version not specified" >&2;}
{ (exit 1); exit 1; }; } ;;
- no) VERSUFFIX=" (CodeSourcery Unofficial)" ;;
- *) VERSUFFIX=" ($withval)" ;;
+ no) PKGVERSION= ;;
+ *) PKGVERSION="($withval) " ;;
esac
else
- VERSUFFIX=
+ PKGVERSION=
fi;
-
# The location to which bugs should be reported.
# Check whether --with-bugurl or --without-bugurl was given.
s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
-s,@VERSUFFIX@,$VERSUFFIX,;t t
+s,@PKGVERSION@,$PKGVERSION,;t t
s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
AM_PROG_LIBTOOL
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
-AC_ARG_WITH(versuffix,
- AS_HELP_STRING([--with-versuffix=SFX],
- [Append SFX to the version string]),
+# Package version. For an official FSF release, it is empty.
+AC_ARG_WITH(pkgversion,
+ AS_HELP_STRING([--with-pkgversion=PKG],
+ [Add PKG to the version string]),
[case "$withval" in
- yes) AC_MSG_ERROR([version suffix not specified]) ;;
- no) VERSUFFIX=" (CodeSourcery Unofficial)" ;;
- *) VERSUFFIX=" ($withval)" ;;
+ yes) AC_MSG_ERROR([package version not specified]) ;;
+ no) PKGVERSION= ;;
+ *) PKGVERSION="($withval) " ;;
esac],
- VERSUFFIX=
+ PKGVERSION=
)
-AC_SUBST(VERSUFFIX)
-
+AC_SUBST(PKGVERSION)
# The location to which bugs should be reported.
AC_ARG_WITH(bugurl,
break;
case 'v':
/* This output is intended to follow the GNU standards document. */
- printf (_("GNU gprof %s\n"), VERSION VERSUFFIX);
+ printf (_("GNU gprof %s\n"), PKGVERSION VERSION);
printf (_("Based on BSD gprof, copyright 1983 Regents of the University of California.\n"));
printf (_("\
This program is free software. This program has absolutely no warranty.\n"));
AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
-I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
BFDLIB = ../bfd/libbfd.la
man_MANS = ld.1
AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO"" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
-I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) \
- -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+ $(REPORT_BUGS_TO) \
-DLOCALEDIR="\"$(datadir)/locale\""
BFDLIB = ../bfd/libbfd.la