ChangeLogTag:Sat Feb 1 14:21:38 2003 Ossama Othman <ossama@uci.edu>

7 files changed, 36 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index a702404793e..0355ac57474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Sat Feb  1 14:21:38 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac:
+
+	  Added gperf related Makefiles to the list of files to generate.
+
+	* apps/Makefile.am:
+	* apps/gperf/Makefile.am:
+	* apps/gperf/src/Makefile.am:
+
+	  Updated for use with Automake 1.7.x or better.
+
+	* m4/ace.m4 (ACE_CONFIGURATION_OPTIONS):
+
+	  Enabled ACE gperf support.
+
 Sat Feb  1 13:22:59 2003  Ossama Othman  <ossama@uci.edu>
 
 	* bin/bootstrap:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a702404793e..0355ac57474 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Sat Feb  1 14:21:38 2003  Ossama Othman  <ossama@uci.edu>
+
+	* configure.ac:
+
+	  Added gperf related Makefiles to the list of files to generate.
+
+	* apps/Makefile.am:
+	* apps/gperf/Makefile.am:
+	* apps/gperf/src/Makefile.am:
+
+	  Updated for use with Automake 1.7.x or better.
+
+	* m4/ace.m4 (ACE_CONFIGURATION_OPTIONS):
+
+	  Enabled ACE gperf support.
+
 Sat Feb  1 13:22:59 2003  Ossama Othman  <ossama@uci.edu>
 
 	* bin/bootstrap:
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 78827331af7..1d353b3d709 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -9,10 +9,6 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
 if COMPILE_GPERF
 GPERF_DIR = gperf
 else
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
index 308d0ce01b5..866c41f9c99 100644
--- a/apps/gperf/Makefile.am
+++ b/apps/gperf/Makefile.am
@@ -9,10 +9,6 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
 SUBDIRS = src ##tests
 
 GPERF_VERSION = 2.0
diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am
index 9a6a7fdb629..4ceb7b6fab5 100644
--- a/apps/gperf/src/Makefile.am
+++ b/apps/gperf/src/Makefile.am
@@ -8,10 +8,6 @@
 ##  Process this file with automake to create Makefile.in
 ##
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
 bin_PROGRAMS = gperf
diff --git a/configure.ac b/configure.ac
index 4f4dfbc370b..6524fb822c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7189,6 +7189,9 @@ AC_CONFIG_FILES([
   aceConf.sh
   Makefile
   ace/Makefile
+  apps/Makefile
+  apps/gperf/Makefile
+  apps/gperf/src/Makefile
 ])
 
 AC_CONFIG_COMMANDS([default],[
diff --git a/m4/ace.m4 b/m4/ace.m4
index 8af78f8dcd6..602c1335650 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -249,7 +249,7 @@ dnl line, then "no_x" is set to "yes."
      AC_MSG_WARN([existing gperf may be overwritten during installation])
    fi
   ])
-dnl AM_CONDITIONAL(COMPILE_GPERF, test X$ace_user_with_gperf = Xyes)
+AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes])
 
 #AC_ARG_WITH([tao],
 # AC_HELP_STRING([--with-tao],[build TAO (the ACE ORB) [[yes]]]),