aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <sch@sch-laptop.localdomain>2006-09-08 22:20:52 -0700
committerStephen Hemminger <sch@sch-laptop.localdomain>2006-09-08 22:20:52 -0700
commit66840291cd76adfa21d8a4f27fa7083582744ff2 (patch)
tree07e22cb409ee4f8aa58ffc92bfba5d29512b06a3
parentcf06742ec8fd4e7ac7d393ebe093839379aa3f46 (diff)
downloadandroid_external_brctl-66840291cd76adfa21d8a4f27fa7083582744ff2.tar.gz
android_external_brctl-66840291cd76adfa21d8a4f27fa7083582744ff2.tar.bz2
android_external_brctl-66840291cd76adfa21d8a4f27fa7083582744ff2.zip
Change the autoconf stuff to handle newer versions of autoconf
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
-rw-r--r--brctl/brctl.c2
-rw-r--r--configure.in1
-rw-r--r--libbridge/config.h.in4
3 files changed, 3 insertions, 4 deletions
diff --git a/brctl/brctl.c b/brctl/brctl.c
index 33c15fd..454b8dd 100644
--- a/brctl/brctl.c
+++ b/brctl/brctl.c
@@ -50,7 +50,7 @@ int main(int argc, char *const* argv)
help();
return 0;
case 'V':
- printf("%s, %s\n", PACKAGE, VERSION);
+ printf("%s, %s\n", PACKAGE_NAME, PACKAGE_VERSION);
return 0;
default:
fprintf(stderr, "Unknown option '%c'\n", f);
diff --git a/configure.in b/configure.in
index 3465861..7a3d29d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(bridge-utils, 1.1)
-AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(libbridge/config.h)
AC_ARG_WITH( linux-headers, [ --with-linux-headers Location of the linux headers to use],
diff --git a/libbridge/config.h.in b/libbridge/config.h.in
index d8da906..b91185e 100644
--- a/libbridge/config.h.in
+++ b/libbridge/config.h.in
@@ -4,8 +4,8 @@
#undef HAVE_LIBSYSFS
/* Name of package */
-#undef PACKAGE
+#undef PACKAGE_NAME
/* Version number of package */
-#undef VERSION
+#undef PACKAGE_VERSION