aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2007-12-04 11:29:32 +0000
committerJan Djärv2007-12-04 11:29:32 +0000
commit9cf8f393addebf0b19c732af6bf493965437f833 (patch)
tree6dba0327b225afbb00868fcb25b8ebaaba6cf3d3
parent07562bde72d953eb156ee8bf5f36d2db37ab8a00 (diff)
downloademacs-9cf8f393addebf0b19c732af6bf493965437f833.tar.gz
emacs-9cf8f393addebf0b19c732af6bf493965437f833.zip
Give package name and verision to AC_INIT.
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure39
-rw-r--r--configure.in2
3 files changed, 29 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 3935fb661f3..43e8ad48e50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12007-12-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * configure.in: Give package name and verision to AC_INIT.
4
12007-12-03 Magnus Henoch <mange@freemail.hu> 52007-12-03 Magnus Henoch <mange@freemail.hu>
2 6
3 * configure.in: Use PKG_CHECK_MODULES to check for D-Bus. 7 * configure.in: Use PKG_CHECK_MODULES to check for D-Bus.
diff --git a/configure b/configure
index 19f55c23fe7..10fea94c506 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.61. 3# Generated by GNU Autoconf 2.61 for emacs 23.0.50.
4# 4#
5# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 5# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
6# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. 6# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -570,13 +570,12 @@ MAKEFLAGS=
570SHELL=${CONFIG_SHELL-/bin/sh} 570SHELL=${CONFIG_SHELL-/bin/sh}
571 571
572# Identity of this package. 572# Identity of this package.
573PACKAGE_NAME= 573PACKAGE_NAME='emacs'
574PACKAGE_TARNAME= 574PACKAGE_TARNAME='emacs'
575PACKAGE_VERSION= 575PACKAGE_VERSION='23.0.50'
576PACKAGE_STRING= 576PACKAGE_STRING='emacs 23.0.50'
577PACKAGE_BUGREPORT= 577PACKAGE_BUGREPORT=''
578 578
579ac_unique_file="src/lisp.h"
580ac_config_libobj_dir=src 579ac_config_libobj_dir=src
581# Factoring default headers for most tests. 580# Factoring default headers for most tests.
582ac_includes_default="\ 581ac_includes_default="\
@@ -776,7 +775,7 @@ sharedstatedir='${prefix}/com'
776localstatedir='${prefix}/var' 775localstatedir='${prefix}/var'
777includedir='${prefix}/include' 776includedir='${prefix}/include'
778oldincludedir='/usr/include' 777oldincludedir='/usr/include'
779docdir='${datarootdir}/doc/${PACKAGE}' 778docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
780infodir='${datarootdir}/info' 779infodir='${datarootdir}/info'
781htmldir='${docdir}' 780htmldir='${docdir}'
782dvidir='${docdir}' 781dvidir='${docdir}'
@@ -1240,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
1240 # Omit some internal or obsolete options to make the list less imposing. 1239 # Omit some internal or obsolete options to make the list less imposing.
1241 # This message is too long to be a string in the A/UX 3.1 sh. 1240 # This message is too long to be a string in the A/UX 3.1 sh.
1242 cat <<_ACEOF 1241 cat <<_ACEOF
1243\`configure' configures this package to adapt to many kinds of systems. 1242\`configure' configures emacs 23.0.50 to adapt to many kinds of systems.
1244 1243
1245Usage: $0 [OPTION]... [VAR=VALUE]... 1244Usage: $0 [OPTION]... [VAR=VALUE]...
1246 1245
@@ -1288,7 +1287,7 @@ Fine tuning of the installation directories:
1288 --infodir=DIR info documentation [DATAROOTDIR/info] 1287 --infodir=DIR info documentation [DATAROOTDIR/info]
1289 --localedir=DIR locale-dependent data [DATAROOTDIR/locale] 1288 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1290 --mandir=DIR man documentation [DATAROOTDIR/man] 1289 --mandir=DIR man documentation [DATAROOTDIR/man]
1291 --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] 1290 --docdir=DIR documentation root [DATAROOTDIR/doc/emacs]
1292 --htmldir=DIR html documentation [DOCDIR] 1291 --htmldir=DIR html documentation [DOCDIR]
1293 --dvidir=DIR dvi documentation [DOCDIR] 1292 --dvidir=DIR dvi documentation [DOCDIR]
1294 --pdfdir=DIR pdf documentation [DOCDIR] 1293 --pdfdir=DIR pdf documentation [DOCDIR]
@@ -1313,7 +1312,9 @@ _ACEOF
1313fi 1312fi
1314 1313
1315if test -n "$ac_init_help"; then 1314if test -n "$ac_init_help"; then
1316 1315 case $ac_init_help in
1316 short | recursive ) echo "Configuration of emacs 23.0.50:";;
1317 esac
1317 cat <<\_ACEOF 1318 cat <<\_ACEOF
1318 1319
1319Optional Features: 1320Optional Features:
@@ -1433,7 +1434,7 @@ fi
1433test -n "$ac_init_help" && exit $ac_status 1434test -n "$ac_init_help" && exit $ac_status
1434if $ac_init_version; then 1435if $ac_init_version; then
1435 cat <<\_ACEOF 1436 cat <<\_ACEOF
1436configure 1437emacs configure 23.0.50
1437generated by GNU Autoconf 2.61 1438generated by GNU Autoconf 2.61
1438 1439
1439Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 1440Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1447,7 +1448,7 @@ cat >config.log <<_ACEOF
1447This file contains any messages produced by compilers while 1448This file contains any messages produced by compilers while
1448running configure, to aid debugging if configure makes a mistake. 1449running configure, to aid debugging if configure makes a mistake.
1449 1450
1450It was created by $as_me, which was 1451It was created by emacs $as_me 23.0.50, which was
1451generated by GNU Autoconf 2.61. Invocation command line was 1452generated by GNU Autoconf 2.61. Invocation command line was
1452 1453
1453 $ $0 $@ 1454 $ $0 $@
@@ -1788,6 +1789,14 @@ fi
1788 1789
1789 1790
1790 1791
1792
1793
1794
1795
1796
1797
1798
1799
1791ac_ext=c 1800ac_ext=c
1792ac_cpp='$CPP $CPPFLAGS' 1801ac_cpp='$CPP $CPPFLAGS'
1793ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 1802ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -24369,7 +24378,7 @@ exec 6>&1
24369# report actual input values of CONFIG_FILES etc. instead of their 24378# report actual input values of CONFIG_FILES etc. instead of their
24370# values after options handling. 24379# values after options handling.
24371ac_log=" 24380ac_log="
24372This file was extended by $as_me, which was 24381This file was extended by emacs $as_me 23.0.50, which was
24373generated by GNU Autoconf 2.61. Invocation command line was 24382generated by GNU Autoconf 2.61. Invocation command line was
24374 24383
24375 CONFIG_FILES = $CONFIG_FILES 24384 CONFIG_FILES = $CONFIG_FILES
@@ -24422,7 +24431,7 @@ Report bugs to <bug-autoconf@gnu.org>."
24422_ACEOF 24431_ACEOF
24423cat >>$CONFIG_STATUS <<_ACEOF 24432cat >>$CONFIG_STATUS <<_ACEOF
24424ac_cs_version="\\ 24433ac_cs_version="\\
24425config.status 24434emacs config.status 23.0.50
24426configured by $0, generated by GNU Autoconf 2.61, 24435configured by $0, generated by GNU Autoconf 2.61,
24427 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 24436 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
24428 24437
diff --git a/configure.in b/configure.in
index c41db750d6f..32e137e0f2e 100644
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,7 @@ dnl Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24dnl Boston, MA 02110-1301, USA. 24dnl Boston, MA 02110-1301, USA.
25 25
26AC_PREREQ(2.61)dnl 26AC_PREREQ(2.61)dnl
27AC_INIT(src/lisp.h) 27AC_INIT(emacs, 23.0.50)
28AC_CONFIG_HEADER(src/config.h:src/config.in) 28AC_CONFIG_HEADER(src/config.h:src/config.in)
29 29
30dnl Support for --program-prefix, --program-suffix and 30dnl Support for --program-prefix, --program-suffix and