Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
1863c18c
Commit
1863c18c
authored
22 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
e0635ea1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+3
-62
3 additions, 62 deletions
configure
configure.in
+2
-1
2 additions, 1 deletion
configure.in
with
5 additions
and
63 deletions
configure
+
3
−
62
View file @
1863c18c
...
@@ -3127,68 +3127,9 @@ fi
...
@@ -3127,68 +3127,9 @@ fi
else
else
LDFLAGS
=
"-L
${
JPEG_PREFIX
}
/lib"
VERSION_FLAGS
=
"
${
VERSION_FLAGS
}
-DHAVE_LIBJPEG"
echo
"
$as_me
:
$LINENO
: checking for jpeg_destroy_decompress in -ljpeg"
>
&5
GUI_INCLUDE
=
"
${
GUI_INCLUDE
}
-I
${
JPEG_PREFIX
}
-I
${
JPEG_PREFIX
}
/include"
echo
$ECHO_N
"checking for jpeg_destroy_decompress in -ljpeg...
$ECHO_C
"
>
&6
GUI_LIBS
=
"
${
GUI_LIBS
}
-L
${
JPEG_PREFIX
}
-L
${
JPEG_PREFIX
}
/lib -ljpeg"
)
if
test
"
${
ac_cv_lib_jpeg_jpeg_destroy_decompress
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
ac_check_lib_save_LIBS
=
$LIBS
LIBS
=
"-ljpeg
$LIBS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
#line
$LINENO
"configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char jpeg_destroy_decompress ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
jpeg_destroy_decompress ();
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
conftest
$ac_exeext
if
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_link
\"
"
)
>
&5
(
eval
$ac_link
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
&&
{
ac_try
=
'test -s conftest$ac_exeext'
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_try
\"
"
)
>
&5
(
eval
$ac_try
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
;
then
ac_cv_lib_jpeg_jpeg_destroy_decompress
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
ac_cv_lib_jpeg_jpeg_destroy_decompress
=
no
fi
rm
-f
conftest.
$ac_objext
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
$ac_check_lib_save_LIBS
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_lib_jpeg_jpeg_destroy_decompress
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_lib_jpeg_jpeg_destroy_decompress
"
>
&6
if
test
$ac_cv_lib_jpeg_jpeg_destroy_decompress
=
yes
;
then
VERSION_FLAGS
=
"
${
VERSION_FLAGS
}
-DHAVE_LIBJPEG"
GUI_INCLUDE
=
"
${
GUI_INCLUDE
}
-I
${
JPEG_PREFIX
}
-I
${
JPEG_PREFIX
}
/include"
GUI_LIBS
=
"
${
GUI_LIBS
}
-L
${
JPEG_PREFIX
}
-L
${
JPEG_PREFIX
}
/lib -ljpeg"
fi
fi
fi
else
else
...
...
This diff is collapsed.
Click to expand it.
configure.in
+
2
−
1
View file @
1863c18c
dnl "$Id: configure.in,v 1.1
8
2003-02-17 01:4
3:21
geuzaine Exp $"
dnl "$Id: configure.in,v 1.1
9
2003-02-17 01:4
6:39
geuzaine Exp $"
dnl
dnl
dnl Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
dnl Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
dnl
dnl
...
@@ -107,6 +107,7 @@ if test "x$enable_gui" != "xno"; then
...
@@ -107,6 +107,7 @@ if test "x$enable_gui" != "xno"; then
GUI_LIBS="${GUI_LIBS} -ljpeg"))
GUI_LIBS="${GUI_LIBS} -ljpeg"))
else
else
dnl Find the libs/includes even if jpeg is _not_ properly installed (ugly hack!)
dnl Find the libs/includes even if jpeg is _not_ properly installed (ugly hack!)
LDFLAGS="-L${JPEG_PREFIX}/lib"
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
VERSION_FLAGS="${VERSION_FLAGS} -DHAVE_LIBJPEG"
VERSION_FLAGS="${VERSION_FLAGS} -DHAVE_LIBJPEG"
GUI_INCLUDE="${GUI_INCLUDE} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"
GUI_INCLUDE="${GUI_INCLUDE} -I${JPEG_PREFIX} -I${JPEG_PREFIX}/include"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment