]> granicus.if.org Git - graphviz/commitdiff
support recent lua packaging change in fc6
authorellson <devnull@localhost>
Wed, 7 Jun 2006 02:01:43 +0000 (02:01 +0000)
committerellson <devnull@localhost>
Wed, 7 Jun 2006 02:01:43 +0000 (02:01 +0000)
  - add BR for lua-devel
  - add configure check for lua.h

configure.ac
graphviz.spec.in

index 6978374ef4940684319d6b76e4c54bbe10da3bc8..3aa3433079ddf4ec7857623a1c70db82eb36bc43 100644 (file)
@@ -521,7 +521,7 @@ AC_CHECK_PROG(JAVA,java,java)
 JAVA_INCLUDES=
 JAVA_LIBS=
 AC_CHECK_HEADER(jni.h,,[
-  AC_MSG_WARN([Unable to find header jni.h. The Java packages will not be built])
+  AC_MSG_WARN([Unable to find header jni.h. The JAVA packages will not be built])
   JAVA=
   ])
 AC_SUBST(JAVA_INCLUDES)
@@ -545,6 +545,10 @@ else
 AC_CHECK_PROG(LUA,lua,lua)
 LUA_INCLUDES=
 LUA_LIBS=
+AC_CHECK_HEADER(lua.h,,[
+  AC_MSG_WARN([Unable to find header lua.h. The LUA packages will not be built])
+  LUA=
+  ])
 AC_SUBST(LUA_INCLUDES)
 AC_SUBST(LUA_LIBS)
 fi
index 98d9fdd27fd30846e259071e585a69ceb5b10e63..97fa2c81c6feb692602e3376f389a54840966cab 100644 (file)
@@ -161,7 +161,7 @@ BuildRequires:      /usr/include/tcl.h /usr/include/tk.h
 %{?fc3:BuildRequires: fontconfig-devel xorg-x11-devel tcl-devel tk-devel} 
 %{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl libtool-ltdl-devel tcl-devel tk-devel guile-devel} 
 %{?fc5:BuildRequires: fontconfig-devel libtool-ltdl libtool-ltdl-devel tcl-devel tk-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel guile-devel}
-%{?fc6:BuildRequires: fontconfig-devel libtool-ltdl libtool-ltdl-devel tcl-devel tk-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel guile-devel gmp-devel}
+%{?fc6:BuildRequires: fontconfig-devel libtool-ltdl libtool-ltdl-devel tcl-devel tk-devel libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel guile-devel gmp-devel lua-devel}
 
 %description
 A collection of tools for the manipulation and layout