celestia-lua50.patch

   1 diff -urN celestia-1.4.1.orig/configure.in celestia-1.4.1.mod/configure.in
   2 --- celestia-1.4.1.orig/configure.in    2006-02-03 19:09:54.000000000 +0100
   3 +++ celestia-1.4.1.mod/configure.in     2006-06-29 21:41:44.159248250 +0200
   4 @@ -256,8 +256,9 @@
   5  dnl (this is a silly trick to make configure behave)
   6  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x" = "y")
   7
   8 +PKG_PROG_PKG_CONFIG
   9 +
  10  if (test "$ui_gtk" != "no"); then
  11 -       PKG_PROG_PKG_CONFIG
  12
  13         dnl GNOME is an extension to the GTK options
  14         if (test "$ui_gnome" = "yes"); then
  15 @@ -363,43 +364,15 @@
  16
  17
  18  AC_ARG_WITH([lua],
  19 -            AC_HELP_STRING([--with-lua[=DIR]],
  20 +            AC_HELP_STRING([--with-lua],
  21                             [Use Lua for Celestia Extension Language support]),
  22 -            enable_lua="$withval",
  23 +            enable_lua="yes",
  24              enable_lua="no")
  25
  26 -AC_ARG_WITH([lua-inc],
  27 -            AC_HELP_STRING([--with-lua-includes[=DIR]],
  28 -                           [Specify location of Lua headers]),
  29 -            lua_includes="$withval",
  30 -            lua_includes="no")
  31 -
  32 -AC_ARG_WITH([lua-lib],
  33 -            AC_HELP_STRING([--with-lua-libs[=DIR]],
  34 -                           [Specify location of Lua libs]),
  35 -            lua_libs="$withval",
  36 -            lua_libs="no")
  37 -
  38 -AC_MSG_CHECKING([whether to enable Celestia Extension Language])
  39 -if (test "$enable_lua" != "no"); then
  40 -       CXXFLAGS="$CXXFLAGS -DCELX"
  41 -       LDFLAGS="$LDFLAGS -llualib -llua"
  42 -
  43 -       if (test "$lua_includes" != "no"); then
  44 -               CXXFLAGS="$CXXFLAGS -I$lua_includes"
  45 -       fi
  46 -
  47 -       if (test "$lua_libs" != "no"); then
  48 -               LIBS="$LIBS -L$lua_libs"
  49 -       fi
  50 -       AC_MSG_RESULT(yes)
  51 -
  52 -       if (test "$enable_lua" != "yes"); then
  53 -               CXXFLAGS="$CXXFLAGS -I$enable_lua/include"
  54 -               LIBS="$LIBS  -L$enable_lua/lib"
  55 -       fi
  56 -else
  57 -       AC_MSG_RESULT(no)
  58 +if (test "x$enable_lua" = "xyes"); then
  59 +       PKG_CHECK_MODULES(LUA, lua,
  60 +                         CXXFLAGS="$CXXFLAGS -DCELX $LUA_CFLAGS"
  61 +                         LIBS="$LIBS $LUA_LIBS")
  62  fi
  63  AM_CONDITIONAL(ENABLE_CELX, test "$enable_lua" != "no")
  64