From 6acc30328feb0a03da4b597175bf976a25db4427 Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Thu, 4 Jan 2007 16:06:13 +0100 Subject: [PATCH 1/2] perl also needed for make dist, even if Xorg is not built. --- configure.ac | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 4a60b3a97..5c912bacf 100644 --- a/configure.ac +++ b/configure.ac @@ -1048,6 +1048,11 @@ xorg_bus_ppcpci=no xorg_bus_sparcpci=no xorg_bus_sparc=no +AC_PATH_PROG(PERL, perl, no) +if test "x$PERL" = xno; then + AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.]) +fi + if test "x$XORG" = xyes; then XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' @@ -1206,14 +1211,6 @@ if test "x$XORG" = xyes; then AC_SUBST([XORG_OS_SUBDIR]) AC_SUBST([XORG_OS_KBD]) - dnl only used in hw/xfree86/scanpci, TTBOMK - AC_PATH_PROG(PERL, perl, no) - dnl unlikely as this may be ... - if test "x$PERL" = xno; then - AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.]) - fi - AC_SUBST(PERL) - # The Xorg binary needs to export symbols so that they can be used from modules # Some platforms require extra flags to do this. gcc should set these flags # when -rdynamic is passed to it, other compilers/linkers may need to be added From fb38acaabe4540f2c956ada77515f0ec269430f1 Mon Sep 17 00:00:00 2001 From: Matthias Hopf Date: Thu, 4 Jan 2007 17:50:33 +0100 Subject: [PATCH 2/2] Nuking .cvsignore files that (accidentally?) got included in EXTRA_DIST. --- hw/darwin/Makefile.am | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index 8a5e981fe..542bfdb24 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -54,7 +54,6 @@ EXTRA_DIST = \ darwinKeyboard.c \ darwinKeyboard.h \ darwinXinput.c \ - iokit/.cvsignore \ iokit/xfIOKit.c \ iokit/xfIOKitCursor.c \ iokit/xfIOKit.h \ @@ -66,11 +65,8 @@ EXTRA_DIST = \ quartz/cr/crFrame.m \ quartz/cr/cr.h \ quartz/cr/crScreen.m \ - quartz/cr/.cvsignore \ quartz/cr/XView.h \ quartz/cr/XView.m \ - quartz/.cvsignore \ - quartz/fullscreen/.cvsignore \ quartz/fullscreen/fullscreen.c \ quartz/fullscreen/quartzCursor.c \ quartz/fullscreen/quartzCursor.h \ @@ -98,7 +94,6 @@ EXTRA_DIST = \ quartz/XDarwinStartup.c \ quartz/XDarwinStartup.man \ quartz/xpr/appledri.c \ - quartz/xpr/.cvsignore \ quartz/xpr/dri.c \ quartz/xpr/dri.h \ quartz/xpr/dristruct.h \