File celestia-1.4.1-configure.patch of Package celestia

Overview Repositories Revisions Requests Users Attributes Meta

File celestia-1.4.1-configure.patch of Package celestia (Revision 35bc49e7142af70ed8165bdd941e00ba)

Currently displaying revision 35bc49e7142af70ed8165bdd941e00ba , Show latest

--- configure.in
+++ configure.in
@@ -65,7 +65,7 @@
 AM_CONFIG_HEADER(config.h)
 
 AM_PO_SUBDIRS
-AM_GNU_GETTEXT([external])
+#AM_GNU_GETTEXT([external])
 
 dnl Check for compilers.  Set CFLAGS and CXXFLAGS to null if unset, so
 dnl that these macros won't set the to default values that we don't want.
@@ -138,6 +138,7 @@
 fi
 AC_MSG_RESULT($enable_profile)
 
+AC_CHECK_FUNCS([vsnprintf snprintf])
 
 dnl
 dnl GL and GLUT libs
@@ -256,7 +257,7 @@
 	dnl GNOME is an extension to the GTK options
 	if (test "$ui_gnome" = "yes"); then
 		PKG_CHECK_MODULES(GTK, libgnomeui-2.0 gtk+-2.0 >= 2.6 gtkglext-1.0)
-		AM_GCONF_SOURCE_2
+		dnl AM_GCONF_SOURCE_2 # would require GNOME autoconf macros
 		AC_DEFINE(GNOME, 1, [Use Gnome Flag])
 	else
 		dnl Otherwise, vanilla GTK
@@ -281,7 +282,7 @@
 dnl
 
 if (test "$ui_kde" != "no"); then
-	dnl KDE_SET_PREFIX
+	KDE_SET_PREFIX
	AC_ENABLE_SHARED(yes)
	AC_ENABLE_STATIC(no)
 
--- src/celestia/Makefile.am
+++ src/celestia/Makefile.am
@@ -5,8 +5,8 @@
 
 if ENABLE_KDE
 SUBDIRS += kde
-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-                  $(LIBSOCKET) kde/libkdegui.a
+celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+                  $(LIBSOCKET)
 celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 endif
 
--- src/celestia/gtk/data/Makefile.am
+++ src/celestia/gtk/data/Makefile.am
@@ -1,5 +1,5 @@
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA = celestia.schemas
+#schemas_DATA = celestia.schemas
 endif
 
 EXTRA_DIST = \
--- Makefile.am	2007/10/22 08:40:34	1.1
+++ Makefile.am	2007/10/22 08:41:19
@@ -66,11 +66,11 @@
 	)
 
 install-data-hook:
-	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@ ; \
+	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@ ; \
+	if [ "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
+		ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
 	fi
 
--- src/celestia/kde/doc/celestia/Makefile.in	2007/10/22 08:52:08	1.1
+++ src/celestia/kde/doc/celestia/Makefile.in	2007/10/22 08:52:34
@@ -642,7 +642,7 @@
 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/; \
 	fi
 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
+	$(LN_S) $(kde_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common
 
 uninstall-docs:
 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/celestia
--- po/Makefile.am	2007/10/22 09:55:56	1.1
+++ po/Makefile.am	2007/10/22 09:56:12
@@ -0,0 +1 @@
+POFILES = AUTO
--- configure.in	2007/10/22 09:56:39	1.3
+++ configure.in	2007/10/22 10:11:08
@@ -338,7 +338,7 @@
 	prefix=$ac_default_prefix
 fi
 
-PKGDATADIR=`eval echo "${datadir}/$PACKAGE"`
+PKGDATADIR="/opt/kde3/share/celestia"
 
 AC_SUBST(PKGDATADIR)
 
@@ -429,7 +429,7 @@
 AC_CONFIG_FILES([ src/celestia/kde/doc/celestia/Makefile ])
 AC_CONFIG_FILES([ src/celestia/gtk/Makefile ])
 AC_CONFIG_FILES([ src/celestia/gtk/data/Makefile ])
-AC_CONFIG_FILES([ po/Makefile.in ])
+AC_CONFIG_FILES([ po/Makefile ])
 AC_OUTPUT()
 
 AC_MSG_RESULT()

Places

File celestia-1.4.1-configure.patch of Package celestia (Revision 35bc49e7142af70ed8165bdd941e00ba)

Places