Author: havner Date: Fri Jul 7 17:47:35 2006 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- for 1.4.1, HEAD merge
---- Files affected:
SOURCES:
celestia-lua50.patch (1.2 -> 1.2.2.1) , celestia-makefile.patch (1.1 ->
1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/celestia-lua50.patch
diff -u SOURCES/celestia-lua50.patch:1.2 SOURCES/celestia-lua50.patch:1.2.2.1
--- SOURCES/celestia-lua50.patch:1.2 Tue Jan 11 22:38:35 2005
+++ SOURCES/celestia-lua50.patch Fri Jul 7 19:47:30 2006
@@ -1,12 +1,64 @@
-diff -ruN celestia./configure.in celestia/configure.in
---- celestia./configure.in 2005-01-11 21:40:24.000000000 +0100
-+++ celestia/configure.in 2005-01-11 21:40:46.963692448 +0100
-@@ -359,7 +359,7 @@
- AC_MSG_CHECKING([whether to enable Celestia Extension Language])
- if (test "$enable_lua" != "no"); then
- CXXFLAGS="$CXXFLAGS -DCELX"
+diff -urN celestia-1.4.1.orig/configure.in celestia-1.4.1.mod/configure.in
+--- celestia-1.4.1.orig/configure.in 2006-02-03 19:09:54.000000000 +0100
++++ celestia-1.4.1.mod/configure.in 2006-06-29 21:41:44.159248250 +0200
+@@ -256,8 +256,9 @@
+ dnl (this is a silly trick to make configure behave)
+ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x" = "y")
+
++PKG_PROG_PKG_CONFIG
++
+ if (test "$ui_gtk" != "no"); then
+- PKG_PROG_PKG_CONFIG
+
+ dnl GNOME is an extension to the GTK options
+ if (test "$ui_gnome" = "yes"); then
+@@ -363,43 +364,15 @@
+
+
+ AC_ARG_WITH([lua],
+- AC_HELP_STRING([--with-lua[=DIR]],
++ AC_HELP_STRING([--with-lua],
+ [Use Lua for Celestia Extension Language support]),
+- enable_lua="$withval",
++ enable_lua="yes",
+ enable_lua="no")
+
+-AC_ARG_WITH([lua-inc],
+- AC_HELP_STRING([--with-lua-includes[=DIR]],
+- [Specify location of Lua headers]),
+- lua_includes="$withval",
+- lua_includes="no")
+-
+-AC_ARG_WITH([lua-lib],
+- AC_HELP_STRING([--with-lua-libs[=DIR]],
+- [Specify location of Lua libs]),
+- lua_libs="$withval",
+- lua_libs="no")
+-
+-AC_MSG_CHECKING([whether to enable Celestia Extension Language])
+-if (test "$enable_lua" != "no"); then
+- CXXFLAGS="$CXXFLAGS -DCELX"
- LDFLAGS="$LDFLAGS -llualib -llua"
-+ LDFLAGS="$LDFLAGS -llualib50 -llua50"
-
- if (test "$lua_includes" != "no"); then
- CXXFLAGS="$CXXFLAGS -I$lua_includes"
+-
+- if (test "$lua_includes" != "no"); then
+- CXXFLAGS="$CXXFLAGS -I$lua_includes"
+- fi
+-
+- if (test "$lua_libs" != "no"); then
+- LIBS="$LIBS -L$lua_libs"
+- fi
+- AC_MSG_RESULT(yes)
+-
+- if (test "$enable_lua" != "yes"); then
+- CXXFLAGS="$CXXFLAGS -I$enable_lua/include"
+- LIBS="$LIBS -L$enable_lua/lib"
+- fi
+-else
+- AC_MSG_RESULT(no)
++if (test "x$enable_lua" = "xyes"); then
++ PKG_CHECK_MODULES(LUA, lua,
++ CXXFLAGS="$CXXFLAGS -DCELX $LUA_CFLAGS"
++ LIBS="$LIBS $LUA_LIBS")
+ fi
+ AM_CONDITIONAL(ENABLE_CELX, test "$enable_lua" != "no")
+
================================================================
Index: SOURCES/celestia-makefile.patch
diff -u SOURCES/celestia-makefile.patch:1.1
SOURCES/celestia-makefile.patch:1.1.2.1
--- SOURCES/celestia-makefile.patch:1.1 Tue Jan 11 22:38:58 2005
+++ SOURCES/celestia-makefile.patch Fri Jul 7 19:47:30 2006
@@ -1,15 +1,20 @@
-diff -ruN celestia./Makefile.am celestia/Makefile.am
---- celestia./Makefile.am 2004-09-23 22:53:05.000000000 +0200
-+++ celestia/Makefile.am 2005-01-11 21:50:57.814828960 +0100
-@@ -31,10 +31,4 @@
- cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
+diff -urN celestia-1.4.1.orig/Makefile.am celestia-1.4.1/Makefile.am
+--- celestia-1.4.1.orig/Makefile.am 2006-02-03 19:04:33.000000000 +0100
++++ celestia-1.4.1/Makefile.am 2006-06-30 00:27:56.358471750 +0200
+@@ -66,11 +66,11 @@
+ )
install-data-hook:
-- if [ -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ;
then \
+- if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h
$(kde_datadir)/@PACKAGE@ ] ; then \
- mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
- rmdir $(kde_datadir)/@PACKAGE@ ; \
-- fi
-- if [ ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
++ if [ "$(DESTDIR)$(kde_datadir)" -a -d
$(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ]
; then \
++ mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/*
$(DESTDIR)$(datadir)/@PACKAGE@/ ; \
++ rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
+ fi
+- if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
- ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \
-- fi
-+
++ if [ "$(DESTDIR)$(kde_datadir)" -a ! -h
$(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
++ ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ;
\
+ fi
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/celestia-lua50.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/SOURCES/celestia-makefile.patch?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
