Scott Klement <[EMAIL PROTECTED]> writes:
> Heh... right after I hit send, I figured out what the problem was!
>
> Here's a patch (against configure.in) that solves the problem for me.
> Can a few of you try it? If it works, please commit it?
autoconf has very good reasons for doing this the way that it does,
and the manual says that the current configure.in is wrong to try to
use $sysconfdir like that at all - see the "Installation Directory
Variables" node in the manual, at least with autoconf 2.50.
Can you try this patch instead, which does it properly, and cleans up
a couple of other bits of configure as well?
--------------------------------------------------
diff --recursive -u tn5250.dist/acconfig.h tn5250/acconfig.h
--- tn5250.dist/acconfig.h Sat Feb 17 19:48:20 2001
+++ tn5250/acconfig.h Wed May 30 22:42:56 2001
@@ -12,6 +12,3 @@
/* Define this to use the new key handler. */
#undef USE_OWN_KEY_PARSING
-
-/* Define this to the system config directory. */
-#undef SYSCONFDIR
diff --recursive -u tn5250.dist/configure.in tn5250/configure.in
--- tn5250.dist/configure.in Wed May 30 21:49:37 2001
+++ tn5250/configure.in Thu May 31 00:17:24 2001
@@ -19,8 +19,6 @@
dnl * Not using gnome, so look for glib and GTK+ instead.
dnl *
AM_PATH_GLIB
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-LIBS="$LIBS $GLIB_LIBS"
dnl **************************************************************************
dnl * Python interface support. *
@@ -50,9 +48,12 @@
AC_MSG_ERROR(** --enable-python specified and python binary not found **)
fi
fi
+ PYTHON_CFLAGS="-I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
],[
enable_python=no
+ PYTHON_CFLAGS=" "
])
+AC_SUBST(PYTHON_CFLAGS)
AC_MSG_CHECKING(for whether to enable python support)
AM_CONDITIONAL(PYTHON, test x$enable_python = xyes)
AC_MSG_RESULT($enable_python)
@@ -171,14 +172,5 @@
dnl * True for anything other than Windoze.
AC_DEFINE_UNQUOTED(SOCKET_TYPE,int)
-
-dnl *
-dnl * Export $sysconfdir as @SYSCONFDIR@ so tn5250 can find it's
-dnl * default config file.
-dnl *
-eval SYSCONFDIR="$sysconfdir"
-eval SYSCONFDIR="$SYSCONFDIR"
-SYSCONFDIR="`echo "$SYSCONFDIR" |sed 's/^NONE/\/usr\/local/'`"
-AC_DEFINE_UNQUOTED(SYSCONFDIR,"$SYSCONFDIR")
AC_OUTPUT(Makefile src/Makefile doc/Makefile linux/Makefile freebsd/Makefile
tn5250-config xt5250)
diff --recursive -u tn5250.dist/src/Makefile.am tn5250/src/Makefile.am
--- tn5250.dist/src/Makefile.am Sat Feb 17 19:48:20 2001
+++ tn5250/src/Makefile.am Thu May 31 00:07:11 2001
@@ -36,13 +36,15 @@
version.c\
wtd.c
-lib5250_la_LIBADD = @with_extra_libs@
+lib5250_la_LIBADD = @with_extra_libs@ @GLIB_LIBS@
+
+INCLUDES = @GLIB_CFLAGS@ @PYTHON_CFLAGS@ \
+ -DSYSCONFDIR=\"$(sysconfdir)\"
# Here's where we build the python module.
if PYTHON
pysodir = @PYTHON_PREFIX@/lib/python@PYTHON_VERSION@/lib-dynload
pyso_LTLIBRARIES = libtn5250module.la
-INCLUDES += -I@PYTHON_PREFIX@/include/python@PYTHON_VERSION@
# For some icky reason, automake or libtool pukes on the below line. So we
# just add all the SOURCES (sigh).
--------------------------------------------------
--
Carey Evans http://home.clear.net.nz/pages/c.evans/
"Quiet, you'll miss the humorous conclusion."
+---
| This is the LINUX5250 Mailing List!
| To submit a new message, send your mail to [EMAIL PROTECTED]
| To subscribe to this list send email to [EMAIL PROTECTED]
| To unsubscribe from this list send email to [EMAIL PROTECTED]
| Questions should be directed to the list owner/operator: [EMAIL PROTECTED]
+---
