AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Save cflags for all backends, not just X11.

Browse Source 
Save cflags for all backends, not just X11.
This commit is contained in:
Elliot Lee 2000-06-08 22:52:21 +00:00
parent d23c74dd44
commit ba0567786b
8 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

3
ChangeLog.pre-2-0
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

3
ChangeLog.pre-2-10
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

3
ChangeLog.pre-2-2
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

3
ChangeLog.pre-2-4
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

3
ChangeLog.pre-2-6
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

3
ChangeLog.pre-2-8
View File

@ -1,3 +1,6 @@
Thu Jun 8 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Save cflags for all backends, not just X11.
Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com> Wed Jun 7 15:44:42 2000 Elliot Lee <sopwith@redhat.com>
* configure.in: Use $PANGO_CONFIG instead of pango-config * configure.in: Use $PANGO_CONFIG instead of pango-config

28
configure.in
View File

@ -213,13 +213,13 @@ LIBS="$LIBS -lm"
AC_TRY_RUN([#include <math.h> AC_TRY_RUN([#include <math.h>
int main (void) { return (log(1) != log(1.)); }], int main (void) { return (log(1) != log(1.)); }],
AC_MSG_RESULT(none needed), AC_MSG_RESULT(none needed),
gtk_save_CFLAGS=$CFLAGS gtk_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -std1" CFLAGS="$CFLAGS -std1"
AC_TRY_RUN([#include <math.h> AC_TRY_RUN([#include <math.h>
int main (void) { return (log(1) != log(1.)); }], int main (void) { return (log(1) != log(1.)); }],
AC_MSG_RESULT(-std1), AC_MSG_RESULT(-std1),
AC_MSG_RESULT() AC_MSG_RESULT()
CFLAGS=$gtk_save_CFLAGS CFLAGS="$gtk_save_CFLAGS"
AC_MSG_WARN( AC_MSG_WARN(
[No ANSI prototypes found in library. (-std1 didn't work.)]), [No ANSI prototypes found in library. (-std1 didn't work.)]),
true true
@ -248,12 +248,12 @@ dnl NeXTStep cc seems to need this
AC_MSG_CHECKING([for extra flags for POSIX compliance]) AC_MSG_CHECKING([for extra flags for POSIX compliance])
AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
AC_MSG_RESULT(none needed), AC_MSG_RESULT(none needed),
gtk_save_CFLAGS=$CFLAGS gtk_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -posix" CFLAGS="$CFLAGS -posix"
AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
AC_MSG_RESULT(-posix), AC_MSG_RESULT(-posix),
AC_MSG_RESULT() AC_MSG_RESULT()
CFLAGS=$gtk_save_CFLAGS CFLAGS="$gtk_save_CFLAGS"
AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)]))) AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
if test x$with_glib = xyes ; then if test x$with_glib = xyes ; then
@ -323,6 +323,9 @@ AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H))
AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H)) AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H)) AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS"
if test "x$gdktarget" = "xx11"; then if test "x$gdktarget" = "xx11"; then
# Find the X11 include and library directories # Find the X11 include and library directories
AC_PATH_X AC_PATH_X
@ -332,9 +335,6 @@ if test "x$gdktarget" = "xx11"; then
x_includes="/usr/include" x_includes="/usr/include"
fi fi
saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS" CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
@ -457,6 +457,8 @@ if test "x$gdktarget" = "xx11"; then
#gtktargetlib = "libgtk-x11.la" #gtktargetlib = "libgtk-x11.la"
AM_CONDITIONAL(USE_X11, true) AM_CONDITIONAL(USE_X11, true)
else
AM_CONDITIONAL(USE_X11, false)
fi fi
if test "x$gdktarget" = "xnanox"; then if test "x$gdktarget" = "xnanox"; then
@ -467,8 +469,8 @@ if test "x$gdktarget" = "xnanox"; then
more_libs="-lnano-X" more_libs="-lnano-X"
more_includes= more_includes=
gdktargetlib = "libgdk-nanox.la" gdktargetlib="libgdk-nanox.la"
gtktargetlib = "libgtk-nanox.la" gtktargetlib="libgtk-nanox.la"
with_xinput=no with_xinput=no
AC_DEFINE(XINPUT_NONE) AC_DEFINE(XINPUT_NONE)
@ -478,6 +480,8 @@ if test "x$gdktarget" = "xnanox"; then
x_libs= x_libs=
xinput_progs= xinput_progs=
AM_CONDITIONAL(USE_NANOX, true) AM_CONDITIONAL(USE_NANOX, true)
else
AM_CONDITIONAL(USE_NANOX, false)
fi fi
if test "x$gdktarget" = "xlinux-fb"; then if test "x$gdktarget" = "xlinux-fb"; then
@ -486,8 +490,8 @@ if test "x$gdktarget" = "xlinux-fb"; then
more_libs= more_libs=
more_includes= more_includes=
gdktargetlib = "libgdk-linux-fb.la" gdktargetlib="libgdk-linux-fb.la"
gtktargetlib = "libgtk-linux-fb.la" gtktargetlib="libgtk-linux-fb.la"
with_xinput=no with_xinput=no
AC_DEFINE(XINPUT_NONE) AC_DEFINE(XINPUT_NONE)
@ -498,6 +502,8 @@ if test "x$gdktarget" = "xlinux-fb"; then
xinput_progs= xinput_progs=
AM_CONDITIONAL(USE_LINUX_FB, true) AM_CONDITIONAL(USE_LINUX_FB, true)
else
AM_CONDITIONAL(USE_LINUX_FB, false)
fi fi
# #