Changeset 3262 in kBuild

Timestamp:

Jan 3, 2019 6:16:57 PM (6 years ago)

Author:

bird

Message:

kmk: rhel4 bootstrap hacking.

Location:

trunk/src/kmk

Files:

• configure.ac (modified) (2 diffs)
• getopt.h (modified) (2 diffs)

trunk/src/kmk/configure.ac

@@ -162 +162 @@
 AC_FUNC_CLOSEDIR_VOID
 
-# See if the user wants to add (or not) GNU Guile support
-PKG_PROG_PKG_CONFIG
-AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
-            [Support GNU Guile for embedded scripting])])
-
-# For some strange reason, at least on Ubuntu, each version of Guile
-# comes with it's own PC file so we have to specify them as individual
-# packages.  Ugh.
-AS_IF([test "x$with_guile" != xno],
-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
-  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
-    [have_guile=no])])
-])
-
-AS_IF([test "$have_guile" = yes],
-      [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])])
-
-AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes])
+# bird: This guile detection does not work on rhel4.  Disabled it all since we doesn't care about guile.
+## See if the user wants to add (or not) GNU Guile support
+#PKG_PROG_PKG_CONFIG
+#AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
+#            [Support GNU Guile for embedded scripting])])
+#
+## For some strange reason, at least on Ubuntu, each version of Guile
+## comes with it's own PC file so we have to specify them as individual
+## packages.  Ugh.
+#AS_IF([test "x$with_guile" != xno],
+#[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
+#  [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
+#    [have_guile=no])])
+#])
+#
+#AS_IF([test "$have_guile" = yes],
+#      [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])])
+#
+#AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes])
 
 AC_FUNC_GETLOADAVG
@@ -507 +508 @@
 
 # Specify what files are to be created.
-AC_CONFIG_FILES([Makefile glob/Makefile po/Makefile.in config/Makefile \
+# bird: Removed po/Makefile.in.
+#AC_CONFIG_FILES([Makefile glob/Makefile po/Makefile.in config/Makefile \
+#                 doc/Makefile w32/Makefile tests/config-flags.pm])
+AC_CONFIG_FILES([Makefile glob/Makefile config/Makefile \
                  doc/Makefile w32/Makefile tests/config-flags.pm])
 

trunk/src/kmk/getopt.h

@@ -17 +17 @@
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef FAKES_NO_GETOPT_H /* bird: hack for rhel4 unistd.h dragging in getopt.h */
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
@@ -129 +130 @@
 
 #endif /* getopt.h */
+#endif /* bird hack */